@fedify/fedify 1.6.1-dev.851 → 1.6.1-dev.856

package/dist/sig/key.js

@@ -79,8 +79,13 @@ async function importJwk(jwk, type) {
 		name: "RSASSA-PKCS1-v1_5",
 		hash: "SHA-256"
 	}, true, type === "public" ? ["verify"] : ["sign"]);
-	else if (jwk.kty === "OKP" && jwk.crv === "Ed25519") key = await crypto.subtle.importKey("jwk", jwk, "Ed25519", true, type === "public" ? ["verify"] : ["sign"]);
-	else throw new TypeError("Unsupported JWK format.");
+	else if (jwk.kty === "OKP" && jwk.crv === "Ed25519") {
+		if (navigator?.userAgent === "Cloudflare-Workers") {
+			jwk = { ...jwk };
+			delete jwk.alg;
+		}
+		key = await crypto.subtle.importKey("jwk", jwk, "Ed25519", true, type === "public" ? ["verify"] : ["sign"]);
+	} else throw new TypeError("Unsupported JWK format.");
 	validateCryptoKey(key, type);
 	return key;
 }

package/dist/testing/docloader.js

@@ -2,11 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
       import { URLPattern } from "urlpattern-polyfill";
     
-import { dirname } from "../node_modules/.pnpm/@jsr_std__path@1.0.9/node_modules/@jsr/std__path/dirname.js";
-import { fromFileUrl } from "../node_modules/.pnpm/@jsr_std__path@1.0.9/node_modules/@jsr/std__path/from_file_url.js";
-import { join } from "../node_modules/.pnpm/@jsr_std__path@1.0.9/node_modules/@jsr/std__path/join.js";
 import { getLogger } from "@logtape/logtape";
-import { readFileSync } from "node:fs";
 
 //#region testing/docloader.ts
 const logger = getLogger([
@@ -22,26 +18,49 @@ const logger = getLogger([
 * the file `testing/fixtures/http/example.com/foo/bar` (no suffix) and return
 * its content as the response.
 */
-function mockDocumentLoader(resource) {
+async function mockDocumentLoader(resource) {
 	const url = new URL(resource);
-	const path = (url.host + url.pathname).split("/");
-	if (url.search) path.push(url.search);
-	const filePath = join(dirname(fromFileUrl(import.meta.url)), "fixtures", ...path);
-	let content;
+	if ("navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers") {
+		const testUrl = new URL(url);
+		testUrl.hostname += ".test";
+		const resp = await fetch(testUrl);
+		if (resp.ok) {
+			const document$1 = await resp.json();
+			logger.debug("Successfully fetched fixture {resource}: {status} {statusText}\n{body}", {
+				resource,
+				status: resp.status,
+				statusText: resp.statusText,
+				body: document$1
+			});
+			return {
+				contextUrl: null,
+				document: document$1,
+				documentUrl: resource
+			};
+		}
+		const error = await resp.text();
+		logger.error("Failed to fetch fixture {resource}: {error}", {
+			resource,
+			error
+		});
+		throw new Error(error);
+	}
+	const path = `./fixtures/${url.host}${url.pathname}.json`;
+	let document;
 	try {
-		content = readFileSync(filePath, { encoding: "utf-8" });
+		document = (await import(path, { with: { type: "json" } })).default;
 	} catch (error) {
-		logger.error("Failed to read fixture file {filePath}: {error}", {
-			filePath,
+		logger.error("Failed to read fixture file {path}: {error}", {
+			path,
 			error
 		});
 		throw error;
 	}
-	return Promise.resolve({
+	return {
 		contextUrl: null,
-		document: JSON.parse(content),
+		document,
 		documentUrl: resource
-	});
+	};
 }
 
 //#endregion

package/dist/testing/fixtures/example.com/{hong-gildong → hong-gildong.json}

@@ -8,4 +8,4 @@
       "@value": "Hong Gildong"
     }
   ]
-}
+}

package/dist/testing/fixtures/example.com/{object → object.json}

@@ -3,4 +3,4 @@
   "type": "Object",
   "id": "https://example.com/object",
   "name": "Fetched object"
-}
+}

package/dist/testing/fixtures/example.com/person.js

@@ -0,0 +1,29 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+      import { URLPattern } from "urlpattern-polyfill";
+    
+//#region testing/fixtures/example.com/person.json
+var __context = ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"];
+var id = "https://example.com/person";
+var type = "Person";
+var name = "John Doe";
+var publicKey = [{
+	"id": "https://example.com/key",
+	"owner": "https://example.com/person",
+	"type": "CryptographicKey",
+	"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyIB9rotX8G6r6/6toT+x\n24BUiQ/HaPH1Em9dOt4c94s+OPFoEdH7DY7Iym9A8LlH4JaGF8KD38bLHWe1S4x0\njV3gHJKhK7veJfGZCKUENcQecBZ+YWUs5HWvUIX1vVB//0luHrg6BQKGOrSOE+WI\nAxyr0qsWCFfZzQrvSnUD2yvg1arJX2xhms14uxoRd5Kg9efKSCmmQaNEapicARUm\nFWrIEpGFa/nUUnqimssAGw1eZFqf3wA4TjhsuARBhGaJtv/3KEa016eMZxy3kDlO\njZnXZTaTgWkXdodwUvy8563fes3Al6BlcS2iJ9qbtha8rSm0FHqoUKH73JsLPKQI\nwQIDAQAB\n-----END PUBLIC KEY-----"
+}, {
+	"id": "https://example.com/key2",
+	"type": "CryptographicKey",
+	"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoRmBtnxbdFutoRd1GLGw\nwGTrsqlRRWUe11hHQaoRLGf5LwQ0tIc6I9q+dynliw+2kxYsLn9SH2je6HcTYOol\ngW7F/cOWXZQN04b+OiYcU1ConAhLjmn4k1uKawJ614y0ScPNd8PQ+CljsnlPxbq9\nofaCMe2BV3B6y09aCuGFJ0nxn1/ubjmIBIWWFTAznoz1J9BhJDGyt3IO3ABy3f9z\nDVlR32L/n5VIkXnxkjUKdzMAOzYb62kuKOp1iznRTPrV71SNtivJMwSh/LVgBrmZ\njtIn/oim+KyX/fdLU3tQ7VClyqmJzyAjccOH6Qj6nFTPh+vX07gqN8IlLT2uye4w\nawIDAQAB\n-----END PUBLIC KEY-----"
+}];
+var person_default = {
+	"@context": __context,
+	id,
+	type,
+	name,
+	publicKey
+};
+
+//#endregion
+export { person_default };

package/dist/testing/fixtures/example.com/person2.js

@@ -0,0 +1,48 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+      import { URLPattern } from "urlpattern-polyfill";
+    
+//#region testing/fixtures/example.com/person2.json
+var __context = [
+	"https://www.w3.org/ns/activitystreams",
+	"https://w3id.org/security/v1",
+	"https://w3id.org/security/multikey/v1",
+	"https://w3id.org/security/data-integrity/v1",
+	"https://www.w3.org/ns/did/v1"
+];
+var id = "https://example.com/person2";
+var type = "Person";
+var name = "Jane Doe";
+var publicKey = [{
+	"id": "https://example.com/person2#key3",
+	"type": "CryptographicKey",
+	"owner": "https://example.com/person2",
+	"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4GUqWgdiYlN3Su5Gr4l6\ni+xRS8gDDVKZ718vpGk6eIpvqs33q430nRbHIzbHRXRaAhc/1++rUBcK0V4/kjZl\nCSzVtRgGU6HMkmjcD+uE56a8XbTczfltbEDj7afoEuB2F3UhQEWrSz+QJ29DPXaL\nMIa1Yv61NR2vxGqNbdtoMjDORMBYtg77CYbcFkiJHw65PDa7+f/yjLxuCRPye5L7\nhncN0UZuuFoRJmHNRLSg5omBad9WTvQXmSyXEhEdk9fHwlI022AqAzlWbT79hldc\nDSKGGLLbQIs1c3JZIG8G5i6Uh5Vy0Z7tSNBcxbhqoI9i9je4f/x/OPIVc19f04BE\n1LgWuHsftZzRgW9Sdqz53W83XxVdxlyHeywXOnstSWT11f8dkLyQUcHKTH+E6urb\nH+aiPLiRpYK8W7D9KTQA9kZ5JXaEuveBd5vJX7wakhbzAn8pWJU7GYIHNY38Ycok\nmivkU5pY8S2cKFMwY0b7ade3MComlir5P3ZYSjF+n6gRVsT96P+9mNfCu9gXt/f8\nXCyjKlH89kGwuJ7HhR8CuVdm0l+jYozVt6GsDy0hHYyn79NCCAEzP7ZbhBMR0T5V\nrkl+TIGXoJH9WFiz4VxO+NnglF6dNQjDS5IzYLoFRXIK1f3cmQiEB4FZmL70l9HL\nrgwR+Xys83xia79OqFDRezMCAwEAAQ==\n-----END PUBLIC KEY-----\n"
+}, {
+	"id": "https://example.com/person2#key4",
+	"type": "CryptographicKey",
+	"owner": "https://example.com/person2",
+	"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEALR8epAGDe+cVq5p2Tx49CCfphpk1rNhkNoY9i+XEUfg=\n-----END PUBLIC KEY-----\n"
+}];
+var assertionMethod = [{
+	"id": "https://example.com/peson2#key3",
+	"type": "Multikey",
+	"controller": "https://example.com/person2",
+	"publicKeyMultibase": "zgghBUVkqmWS8e1j4aN2yowLAEkJC6wowB9wWmLRACYCok7UzstWcTBp3waKiDUM7wqL9bbBD9W9FvNaXEK2KPCZ9ffhvd5dxChJL9bdPQSrMwa28FEYMGDtcF1uocrYNmZm2dBBMaWrCu8U3s4PpVVhn4hsWDL8GLuE466pkJs9Hy8xmECoaaVgAZLiYDw2gwrjHDiX2i7aDHKfE7aSZWUWmC8nAGNZ7DX5pXoyXK3pxuaCWxNxXwPmaFwgKDyy9uhtBJ8znp9NZXkXHBTQe5uAi8GFwHY5asvqCmYPrAGWxcT6pdbZaJHdWkM7nw6apBHfakKs42oMqdBoJ2WkkresoT1qHrX2GW7gNP9PLtveF4vfEd6cwgHKQCdYgayG3muGfZiPvML75cyfkNrjkctvuQUfMxY9umbd2TG3V3mPnLrvQnqHpuRMZYtCn3nX1qfZaqFhTwT4NFPqVNLqvgR6k9vcuGXn6Ndaumhd5xtTK64jk3e2gPBit9iq6MrFUSoxNsbTty4kqcHAodtkK8CMSxUxbFP1kK3nyy8ZfeMgDCts1KboBcT2m5FMpQpYxKtNBfvhTuyeDDC34uhbY8itmTAnDwSr5mKrniwwDUGPZFejda51TYs1N9D9Ejzaw5Mvr8qN6wahHmsDBWTbWwV6YKVMD1MjAhJBUopWJWB5x6mEBAX25MssKfAEhJyDtqYWjq63uQHUJCsPJp"
+}, {
+	"id": "https://example.com/person2#key4",
+	"type": "Multikey",
+	"controller": "https://example.com/person2",
+	"publicKeyMultibase": "z6MkhVPuyvgG1RkMv67azDqDCDERPXVrUg1i3qchXY5EACE3"
+}];
+var person2_default = {
+	"@context": __context,
+	id,
+	type,
+	name,
+	publicKey,
+	assertionMethod
+};
+
+//#endregion
+export { person2_default };

package/dist/testing/fixtures/example.com/{test → test.json}

@@ -2,4 +2,4 @@
   "https://example.com/prop/test": {
     "@value": "foo"
   }
-}
+}

package/dist/testing/fixtures/w3id.org/security/data-integrity/{v1 → v1.json}

@@ -71,4 +71,4 @@
       }
     }
   }
-}
+}

package/dist/testing/fixtures/w3id.org/security/{v1 → v1.json}

@@ -20,28 +20,28 @@
     "cipherAlgorithm": "sec:cipherAlgorithm",
     "cipherData": "sec:cipherData",
     "cipherKey": "sec:cipherKey",
-    "created": {"@id": "dc:created", "@type": "xsd:dateTime"},
-    "creator": {"@id": "dc:creator", "@type": "@id"},
+    "created": { "@id": "dc:created", "@type": "xsd:dateTime" },
+    "creator": { "@id": "dc:creator", "@type": "@id" },
     "digestAlgorithm": "sec:digestAlgorithm",
     "digestValue": "sec:digestValue",
     "domain": "sec:domain",
     "encryptionKey": "sec:encryptionKey",
-    "expiration": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
-    "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+    "expiration": { "@id": "sec:expiration", "@type": "xsd:dateTime" },
+    "expires": { "@id": "sec:expiration", "@type": "xsd:dateTime" },
     "initializationVector": "sec:initializationVector",
     "iterationCount": "sec:iterationCount",
     "nonce": "sec:nonce",
     "normalizationAlgorithm": "sec:normalizationAlgorithm",
-    "owner": {"@id": "sec:owner", "@type": "@id"},
+    "owner": { "@id": "sec:owner", "@type": "@id" },
     "password": "sec:password",
-    "privateKey": {"@id": "sec:privateKey", "@type": "@id"},
+    "privateKey": { "@id": "sec:privateKey", "@type": "@id" },
     "privateKeyPem": "sec:privateKeyPem",
-    "publicKey": {"@id": "sec:publicKey", "@type": "@id"},
+    "publicKey": { "@id": "sec:publicKey", "@type": "@id" },
     "publicKeyBase58": "sec:publicKeyBase58",
     "publicKeyPem": "sec:publicKeyPem",
     "publicKeyWif": "sec:publicKeyWif",
-    "publicKeyService": {"@id": "sec:publicKeyService", "@type": "@id"},
-    "revoked": {"@id": "sec:revoked", "@type": "xsd:dateTime"},
+    "publicKeyService": { "@id": "sec:publicKeyService", "@type": "@id" },
+    "revoked": { "@id": "sec:revoked", "@type": "xsd:dateTime" },
     "salt": "sec:salt",
     "signature": "sec:signature",
     "signatureAlgorithm": "sec:signingAlgorithm",

package/dist/testing/mod.d.ts

@@ -0,0 +1,11 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";
+
+//#region testing/mod.d.ts
+declare const testDefinitions: Deno.TestDefinition[];
+declare function test(options: Deno.TestDefinition): void;
+declare function test(name: string, fn: (t: Deno.TestContext) => void | Promise<void>): void;
+declare function test(name: string, options: Omit<Deno.TestDefinition, "fn" | "name">, fn: (t: Deno.TestContext) => void | Promise<void>): void;
+
+//#endregion
+export { test, testDefinitions };

package/dist/testing/mod.js

@@ -2,11 +2,12 @@
       import { Temporal } from "@js-temporal/polyfill";
       import { URLPattern } from "urlpattern-polyfill";
     
+import { __require } from "../_virtual/rolldown_runtime.js";
 import { configure, getConsoleSink, reset } from "@logtape/logtape";
-import { test } from "node:test";
 
 //#region testing/mod.ts
-function test$1(name, options, fn) {
+const testDefinitions = [];
+function test(name, options, fn) {
 	const def = typeof name === "string" ? typeof options === "function" ? {
 		name,
 		fn: options
@@ -15,37 +16,39 @@ function test$1(name, options, fn) {
 		...options,
 		fn
 	} : name;
-	const func = def.fn;
-	if ("Deno" in globalThis) Deno.test({
-		...def,
-		async fn(t) {
-			const records = [];
-			await configure({
-				sinks: {
-					buffer(record) {
-						if (record.category.length > 1 && record.category[0] === "logtape" && record.category[1] === "meta") return;
-						records.push(record);
+	testDefinitions.push(def);
+	if ("Deno" in globalThis) {
+		const func = def.fn;
+		Deno.test({
+			...def,
+			async fn(t) {
+				const records = [];
+				await configure({
+					sinks: {
+						buffer(record) {
+							if (record.category.length > 1 && record.category[0] === "logtape" && record.category[1] === "meta") return;
+							records.push(record);
+						},
+						console: getConsoleSink()
 					},
-					console: getConsoleSink()
-				},
-				filters: {},
-				loggers: [{
-					category: [],
-					sinks: [Deno.env.get("LOG") === "always" ? "console" : "buffer"]
-				}]
-			});
-			try {
-				await func(t);
-			} catch (e) {
-				const consoleSink = getConsoleSink();
-				for (const record of records) consoleSink(record);
-				throw e;
-			} finally {
-				await reset();
+					filters: {},
+					loggers: [{
+						category: [],
+						sinks: [Deno.env.get("LOG") === "always" ? "console" : "buffer"]
+					}]
+				});
+				try {
+					await func(t);
+				} catch (e) {
+					const consoleSink = getConsoleSink();
+					for (const record of records) consoleSink(record);
+					throw e;
+				} finally {
+					await reset();
+				}
 			}
-		}
-	});
-	else if ("Bun" in globalThis) {
+		});
+	} else if ("Bun" in globalThis) {
 		let failed = void 0;
 		async function step(defOrNameOrFn, fn$2) {
 			let def$1;
@@ -84,12 +87,15 @@ function test$1(name, options, fn) {
 		if (def.ignore) bunTest.skip(def.name, fn$1);
 		else if (def.only) bunTest.only(def.name, fn$1);
 		else bunTest(def.name, fn$1);
-	} else test(def.name, {
-		only: def.only,
-		skip: def.ignore
-	}, async (t) => {
-		await def.fn(intoDenoTestContext(def.name, t));
-	});
+	} else try {
+		const { test: nodeTest } = __require("node:test");
+		nodeTest(def.name, {
+			only: def.only,
+			skip: def.ignore
+		}, async (t) => {
+			await def.fn(intoDenoTestContext(def.name, t));
+		});
+	} catch {}
 }
 function intoDenoTestContext(name, ctx) {
 	async function step(defOrNameOrFn, fn) {
@@ -133,4 +139,4 @@ function caller() {
 }
 
 //#endregion
-export { test$1 as test };
+export { test, testDefinitions };

package/dist/vocab/lookup.test.js

@@ -8,33 +8,30 @@ import { assertEquals } from "../node_modules/.pnpm/@jsr_std__assert@0.226.0/nod
 import { assertInstanceOf } from "../node_modules/.pnpm/@jsr_std__assert@0.226.0/node_modules/@jsr/std__assert/assert_instance_of.js";
 import { test } from "../testing/mod.js";
 import { mockDocumentLoader } from "../testing/docloader.js";
-import { install, mock, uninstall } from "../node_modules/.pnpm/@jsr_hongminhee__deno-mock-fetch@0.3.2/node_modules/@jsr/hongminhee__deno-mock-fetch/mod.js";
+import { esm_default } from "../node_modules/.pnpm/fetch-mock@12.5.2/node_modules/fetch-mock/dist/esm/index.js";
 
 //#region vocab/lookup.test.ts
 test("lookupObject()", async (t) => {
-	install();
-	mock("GET@/.well-known/webfinger", (req) => {
-		assertEquals(new URL(req.url).host, "example.com");
-		return new Response(JSON.stringify({
-			subject: "acct:johndoe@example.com",
-			links: [
-				{
-					rel: "alternate",
-					href: "https://example.com/object",
-					type: "application/activity+json"
-				},
-				{
-					rel: "self",
-					href: "https://example.com/html/person",
-					type: "text/html"
-				},
-				{
-					rel: "self",
-					href: "https://example.com/person",
-					type: "application/activity+json"
-				}
-			]
-		}));
+	esm_default.spyGlobal();
+	esm_default.get("begin:https://example.com/.well-known/webfinger", {
+		subject: "acct:johndoe@example.com",
+		links: [
+			{
+				rel: "alternate",
+				href: "https://example.com/object",
+				type: "application/activity+json"
+			},
+			{
+				rel: "self",
+				href: "https://example.com/html/person",
+				type: "text/html"
+			},
+			{
+				rel: "self",
+				href: "https://example.com/person",
+				type: "application/activity+json"
+			}
+		]
 	});
 	const options = {
 		documentLoader: mockDocumentLoader,
@@ -64,22 +61,20 @@ test("lookupObject()", async (t) => {
 			name: "Hong Gildong"
 		}));
 	});
-	mock("GET@/.well-known/webfinger", (req) => {
-		assertEquals(new URL(req.url).host, "example.com");
-		return new Response(JSON.stringify({
-			subject: "acct:janedoe@example.com",
-			links: [{
-				rel: "self",
-				href: "https://example.com/404",
-				type: "application/activity+json"
-			}]
-		}));
+	esm_default.removeRoutes();
+	esm_default.get("begin:https://example.com/.well-known/webfinger", {
+		subject: "acct:janedoe@example.com",
+		links: [{
+			rel: "self",
+			href: "https://example.com/404",
+			type: "application/activity+json"
+		}]
 	});
 	await t.step("not found", async () => {
 		assertEquals(await lookupObject("janedoe@example.com", options), null);
 		assertEquals(await lookupObject("https://example.com/404", options), null);
 	});
-	uninstall();
+	esm_default.hardReset();
 });
 test("traverseCollection()", async () => {
 	const options = {