@fedify/fedify 2.2.16 → 2.2.18-dev.2386

package/dist/sig/key.test.mjs

@@ -6,11 +6,13 @@ import "../std__assert-BVFj8-_V.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-DCQAjTMo.mjs";
+import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
+import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-BtVvc9pe.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
+import { _ as wrapContextLoaderForJsonLd } from "../ld-1J9cdTp0.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
-import { CryptographicKey, Multikey } from "@fedify/vocab";
-import { FetchError } from "@fedify/vocab-runtime";
+import { CryptographicKey, Multikey, Person } from "@fedify/vocab";
+import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
 //#region src/sig/key.test.ts
 test("validateCryptoKey()", async () => {
 	const pkcs1v15 = await crypto.subtle.generateKey({
@@ -399,6 +401,199 @@ test("fetchKey() returns null for a malformed actor publicKey", async () => {
 		cached: true
 	});
 });
+for (const cls of [CryptographicKey, Multikey]) for (const location of [
+	"actor",
+	"key",
+	"owner"
+]) test(`fetchKey() handles JSON-LD context failures in ${cls.name} ${location} documents`, async (t) => {
+	const actorId = new URL("https://example.com/context-actor");
+	const keyId = new URL(`${actorId.href}#key`);
+	const key = cls === CryptographicKey ? rsaPublicKey1.clone({
+		id: keyId,
+		owner: actorId
+	}) : ed25519Multikey.clone({
+		id: keyId,
+		controller: actorId
+	});
+	const actorDocument = await new Person({
+		id: actorId,
+		...key instanceof CryptographicKey ? { publicKeys: [key] } : { assertionMethods: [key] }
+	}).toJsonLd({ contextLoader: mockDocumentLoader });
+	const keyDocument = await key.toJsonLd({ contextLoader: mockDocumentLoader });
+	const contextUrl = `https://example.com/context/${cls.name}/${location}`;
+	const transportErrors = [
+		/* @__PURE__ */ new TypeError("fetch failed"),
+		/* @__PURE__ */ new TypeError("error reading a body from connection"),
+		globalThis.Object.assign(/* @__PURE__ */ new TypeError("The socket connection was closed unexpectedly."), { code: "ECONNRESET" }),
+		globalThis.Object.assign(/* @__PURE__ */ new TypeError("Network request failed"), { code: "ECONNRESET" }),
+		new TypeError("Network request failed", { cause: globalThis.Object.assign(/* @__PURE__ */ new Error("connection refused"), { code: "ECONNREFUSED" }) }),
+		new FetchError(contextUrl, "HTTP 503"),
+		new FetchError(contextUrl, "HTTP 503", new Response("unavailable", { status: 503 })),
+		new UrlError("DNS lookup failed", { reason: "dns" }),
+		globalThis.Object.assign(/* @__PURE__ */ new Error("request aborted"), { name: "AbortError" })
+	];
+	const programmingErrors = [
+		/* @__PURE__ */ new Error("loader bug"),
+		/* @__PURE__ */ new ReferenceError("loader bug"),
+		/* @__PURE__ */ new TypeError("loader bug"),
+		"loader bug",
+		null,
+		void 0
+	];
+	const cases = [
+		{ kind: "inline" },
+		{
+			kind: "url",
+			wrapped: false
+		},
+		{
+			kind: "url",
+			wrapped: true
+		},
+		{
+			kind: "wrapped",
+			error: /* @__PURE__ */ new TypeError("Invalid URL string.")
+		},
+		{
+			kind: "remote",
+			document: 123
+		},
+		{
+			kind: "remote",
+			document: "not JSON"
+		},
+		{
+			kind: "remote",
+			document: { "@context": contextUrl }
+		},
+		...transportErrors.map((error) => ({
+			kind: "transport",
+			error
+		})),
+		...programmingErrors.map((error) => ({
+			kind: "programming",
+			error
+		})),
+		...location === "key" ? [{
+			kind: "transport",
+			error: /* @__PURE__ */ new TypeError("fetch failed"),
+			fallback: true
+		}, {
+			kind: "programming",
+			error: /* @__PURE__ */ new ReferenceError("fallback bug"),
+			fallback: true
+		}] : []
+	];
+	for (const scenario of cases) {
+		const description = "error" in scenario ? scenario.error instanceof Error ? `${scenario.error.name}: ${scenario.error.message}` : String(scenario.error) : "document" in scenario ? JSON.stringify(scenario.document) : "invalid type mapping";
+		await t.step(`${scenario.kind}: ${description}${"fallback" in scenario ? " (fallback)" : ""}`, async () => {
+			const cache = {};
+			let fetchError = { error: /* @__PURE__ */ new Error("stale fetch error") };
+			let recovered = false;
+			let contextLoads = 0;
+			const options = {
+				documentLoader(resource) {
+					const document = structuredClone(resource === keyId.href && location !== "actor" ? keyDocument : actorDocument);
+					if (location === "actor" || location === "key" && resource === keyId.href || location === "owner" && resource === actorId.href) {
+						const context = scenario.kind === "inline" ? { broken: {
+							"@id": "https://example.com/ns#broken",
+							"@type": "not-an-absolute-iri"
+						} } : scenario.kind === "url" ? "http://[" : contextUrl;
+						document["@context"] = [document["@context"], context].flat();
+					}
+					return Promise.resolve({
+						contextUrl: null,
+						documentUrl: resource,
+						document
+					});
+				},
+				async contextLoader(resource) {
+					if (scenario.kind === "url" && resource === "http://[") {
+						const loader = getDocumentLoader();
+						return await (scenario.wrapped ? wrapContextLoaderForJsonLd(loader) : loader)(resource);
+					}
+					if (scenario.kind === "wrapped" && resource === contextUrl) return await wrapContextLoaderForJsonLd(() => Promise.reject(scenario.error))(resource);
+					if (resource !== contextUrl) return await mockDocumentLoader(resource);
+					contextLoads++;
+					if (!recovered && "error" in scenario && (!("fallback" in scenario) || contextLoads > 1)) throw scenario.error;
+					return {
+						contextUrl: null,
+						documentUrl: resource,
+						document: !recovered && "document" in scenario ? scenario.document : { "@context": {} }
+					};
+				},
+				keyCache: {
+					get: (id) => Promise.resolve(cache[id.href]),
+					set(id, value) {
+						cache[id.href] = value;
+						return Promise.resolve();
+					},
+					getFetchError: () => Promise.resolve(fetchError),
+					setFetchError(_id, error) {
+						fetchError = error ?? void 0;
+						return Promise.resolve();
+					}
+				}
+			};
+			const lookup = () => fetchKey(keyId, cls, options);
+			if (scenario.kind === "programming" && "error" in scenario) {
+				assertStrictEquals(await assertRejects(lookup), scenario.error);
+				assertEquals(cache, {});
+				assertStrictEquals(await assertRejects(() => fetchKeyDetailed(keyId, cls, options)), scenario.error);
+				assertEquals(cache, {});
+				return;
+			}
+			assertEquals(await lookup(), {
+				key: null,
+				cached: false
+			});
+			assertEquals(cache, { [keyId.href]: null });
+			const detailed = await fetchKeyDetailed(keyId, cls, options);
+			assertEquals(detailed.cached, true);
+			if (scenario.kind === "transport" || scenario.kind === "wrapped") {
+				assert(detailed.fetchError != null);
+				if (scenario.error instanceof FetchError && scenario.error.response != null) {
+					assert("status" in detailed.fetchError);
+					assertEquals(detailed.fetchError.status, 503);
+					assertEquals(await detailed.fetchError.response.text(), "unavailable");
+				} else {
+					assert("error" in detailed.fetchError);
+					assertStrictEquals(detailed.fetchError.error, scenario.error);
+				}
+			} else assertEquals(detailed.fetchError, void 0);
+			const previousLoads = contextLoads;
+			assertEquals(await lookup(), {
+				key: null,
+				cached: true
+			});
+			assertEquals(contextLoads, previousLoads);
+			delete cache[keyId.href];
+			fetchError = void 0;
+			const fresh = await fetchKeyDetailed(keyId, cls, options);
+			assertEquals(fresh.cached, false);
+			assertEquals(fresh.key, null);
+			if (scenario.kind === "transport" || scenario.kind === "wrapped") {
+				assert(fresh.fetchError != null);
+				if (scenario.error instanceof FetchError && scenario.error.response != null) {
+					assert("status" in fresh.fetchError);
+					assertEquals(fresh.fetchError.status, 503);
+					assertEquals(await fresh.fetchError.response.text(), "unavailable");
+				} else {
+					assert("error" in fresh.fetchError);
+					assertStrictEquals(fresh.fetchError.error, scenario.error);
+				}
+			} else assertEquals(fresh.fetchError, void 0);
+			if (scenario.kind === "transport") {
+				delete cache[keyId.href];
+				recovered = true;
+				const result = await lookup();
+				assertEquals(result.cached, false);
+				assertEquals(result.key?.id, keyId);
+				assert(result.key?.publicKey != null);
+			}
+		});
+	}
+});
 test("fetchKey() rejects a key whose owner does not link back", async () => {
 	const keyId = "https://attacker.example/key";
 	const keyDocument = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });

package/dist/sig/ld.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { a as generateCryptoKeyPair } from "../key-DCQAjTMo.mjs";
+import { a as generateCryptoKeyPair } from "../key-BtVvc9pe.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-37J55dno.mjs";
+import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-1J9cdTp0.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey } from "@fedify/vocab";
 import { encodeBase64 } from "byte-encodings/base64";

package/dist/sig/mod.cjs

@@ -1,8 +1,8 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-B7mxZjxT.cjs");
-const require_proof = require("../proof-ZUtbM4a6.cjs");
+const require_http = require("../http-C_Qq0cNx.cjs");
+const require_proof = require("../proof-C6uAR-Hj.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { _ as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, g as parseAcceptSignature, h as fulfillAcceptSignature, i as verifyRequest, l as fetchKeyDetailed, m as formatAcceptSignature, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "../http-DK5sOqk3.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-BdrKA26Y.js";
+import { _ as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, g as parseAcceptSignature, h as fulfillAcceptSignature, i as verifyRequest, l as fetchKeyDetailed, m as formatAcceptSignature, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "../http-DP-vbG4o.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-BJ332wO_.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import "../std__assert-BVFj8-_V.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-Bou1yabn.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CgurOfJ9.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 //#region src/sig/owner.test.ts

package/dist/sig/proof.test.mjs

@@ -7,7 +7,7 @@ import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-amccRMrV.mjs";
-import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-BFSV3hJj.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-Dn4nm7pr.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";

package/dist/{temporal-BWuGBFaX.mjs → temporal-BZrzDMq2.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-37J55dno.mjs";
+import { c as getNormalizationContextLoader } from "./ld-1J9cdTp0.mjs";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/federation/temporal.ts
 function isPlainObject(value) {

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-BVFj8-_V.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
-import { l as verifyRequest } from "../http-B72sZOJB.mjs";
+import { l as verifyRequest } from "../http-DovhI1VM.mjs";
 import { i as rsaPrivateKey2 } from "../keys-BAK-tUlf.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-NG6Mmr-J.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-B4Hk3LSj.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 import { configure, reset } from "@logtape/logtape";

package/dist/utils/mod.cjs

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-DCIQW7aM.cjs");
+const require_kv_cache = require("../kv-cache-Ds_adaor.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-BatvhvQ8.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-D8yJIXRo.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.2.16",
+  "version": "2.2.18-dev.2386+41abb5f5",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -153,9 +153,9 @@
     "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/webfinger": "2.2.16",
-    "@fedify/vocab": "2.2.16",
-    "@fedify/vocab-runtime": "2.2.16"
+    "@fedify/vocab": "2.2.18-dev.2386+41abb5f5",
+    "@fedify/vocab-runtime": "2.2.18-dev.2386+41abb5f5",
+    "@fedify/webfinger": "2.2.18-dev.2386+41abb5f5"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -168,7 +168,7 @@
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.2.16"
+    "@fedify/vocab-tools": "^2.2.18-dev.2386+41abb5f5"
   },
   "scripts": {
     "build:self": "tsdown",