@fedify/fedify 2.0.0-dev.1485 → 2.0.0-dev.149

package/dist/lookup-BV72lfsA.js

@@ -0,0 +1,256 @@
+
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        
+import { getLogger } from "@logtape/logtape";
+import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import { UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
+
+//#region deno.json
+var name = "@fedify/fedify";
+var version = "2.0.0-dev.149+56d8c96c";
+var license = "MIT";
+var exports = {
+	".": "./src/mod.ts",
+	"./compat": "./src/compat/mod.ts",
+	"./federation": "./src/federation/mod.ts",
+	"./nodeinfo": "./src/nodeinfo/mod.ts",
+	"./otel": "./src/otel/mod.ts",
+	"./sig": "./src/sig/mod.ts",
+	"./vocab": "./src/vocab/mod.ts",
+	"./utils": "./src/utils/mod.ts",
+	"./webfinger": "./src/webfinger/mod.ts"
+};
+var imports = {
+	"@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
+	"@opentelemetry/core": "npm:@opentelemetry/core@^2.0.0",
+	"@opentelemetry/sdk-trace-base": "npm:@opentelemetry/sdk-trace-base@^2.0.0",
+	"@opentelemetry/semantic-conventions": "npm:@opentelemetry/semantic-conventions@^1.27.0",
+	"@std/assert": "jsr:@std/assert@^0.226.0",
+	"@std/url": "jsr:@std/url@^0.225.1",
+	"asn1js": "npm:asn1js@^3.0.7",
+	"fast-check": "npm:fast-check@^3.22.0",
+	"fetch-mock": "npm:fetch-mock@^12.5.2",
+	"json-canon": "npm:json-canon@^1.0.1",
+	"jsonld": "npm:jsonld@^9.0.0",
+	"multicodec": "npm:multicodec@^3.2.1",
+	"pkijs": "npm:pkijs@^3.3.3",
+	"structured-field-values": "npm:structured-field-values@^2.0.4",
+	"uri-template-router": "npm:uri-template-router@^1.0.0",
+	"url-template": "npm:url-template@^3.1.1"
+};
+var include = ["src/vocab/vocab.ts"];
+var exclude = [
+	".test-report.xml",
+	"apidoc/",
+	"dist/",
+	"node_modules/",
+	"npm/",
+	"pnpm-lock.yaml",
+	"src/cfworkers/dist/",
+	"src/cfworkers/fixtures/",
+	"src/cfworkers/imports.ts",
+	"src/cfworkers/README.md",
+	"src/cfworkers/server.ts",
+	"src/cfworkers/server.js",
+	"src/cfworkers/server.js.map",
+	"src/vocab/*.yaml",
+	"!src/vocab/vocab.ts"
+];
+var publish = { "exclude": ["**/*.test.ts", "src/testing/"] };
+var tasks = {
+	"codegen": "deno run --allow-read --allow-write --allow-env --check scripts/codegen.ts && deno fmt src/vocab/vocab.ts && deno cache src/vocab/vocab.ts && deno check src/vocab/vocab.ts",
+	"cache": {
+		"command": "deno cache src/mod.ts",
+		"dependencies": ["codegen"]
+	},
+	"check": {
+		"command": "deno fmt --check && deno lint && deno check src/**/*.ts",
+		"dependencies": ["codegen"]
+	},
+	"test": {
+		"command": "deno test --check --doc --allow-read --allow-write --allow-env --unstable-kv --trace-leaks --parallel",
+		"dependencies": ["codegen"]
+	},
+	"coverage": "deno task test --clean --coverage && deno coverage --html coverage",
+	"bench": {
+		"command": "deno bench --allow-read --allow-write --allow-net --allow-env --allow-run --unstable-kv",
+		"dependencies": ["codegen"]
+	},
+	"apidoc": {
+		"command": "deno doc --html --name=Fedify --output=apidoc/ src/mod.ts",
+		"dependencies": ["codegen"]
+	},
+	"publish": {
+		"command": "deno publish",
+		"dependencies": ["codegen"]
+	},
+	"pnpm:install": "pnpm install --silent",
+	"pnpm:build": {
+		"command": "pnpm exec tsdown",
+		"dependencies": [
+			"codegen",
+			"pnpm:install",
+			"pnpm:build-vocab",
+			"pnpm:build-fixture"
+		]
+	},
+	"pnpm:build-vocab-runtime": { "command": "cd ../vocab-runtime && pnpm build" },
+	"pnpm:build-vocab-tools": { "command": "cd ../vocab-tools && pnpm build" },
+	"pnpm:build-vocab": { "dependencies": ["pnpm:build-vocab-runtime", "pnpm:build-vocab-tools"] },
+	"test:node": {
+		"command": "cd dist/ && node --test",
+		"dependencies": ["pnpm:build"]
+	},
+	"test:bun": {
+		"command": "cd dist/ && bun test --timeout 60000",
+		"dependencies": ["pnpm:build"]
+	},
+	"test:cfworkers": {
+		"command": "pnpm exec wrangler deploy --dry-run --outdir src/cfworkers && node --import=tsx src/cfworkers/client.ts",
+		"dependencies": ["pnpm:build"]
+	},
+	"test-all": { "dependencies": [
+		"check",
+		"test",
+		"test:node",
+		"test:bun",
+		"test:cfworkers"
+	] }
+};
+var deno_default = {
+	name,
+	version,
+	license,
+	exports,
+	imports,
+	include,
+	exclude,
+	publish,
+	tasks
+};
+
+//#endregion
+//#region src/webfinger/lookup.ts
+const logger = getLogger([
+	"fedify",
+	"webfinger",
+	"lookup"
+]);
+const DEFAULT_MAX_REDIRECTION = 5;
+/**
+* Looks up a WebFinger resource.
+* @param resource The resource URL to look up.
+* @param options Extra options for looking up the resource.
+* @returns The resource descriptor, or `null` if not found.
+* @since 0.2.0
+*/
+async function lookupWebFinger(resource, options = {}) {
+	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
+	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
+	return await tracer.startActiveSpan("webfinger.lookup", {
+		kind: SpanKind.CLIENT,
+		attributes: {
+			"webfinger.resource": resource.toString(),
+			"webfinger.resource.scheme": typeof resource === "string" ? resource.replace(/:.*$/, "") : resource.protocol.replace(/:$/, "")
+		}
+	}, async (span) => {
+		try {
+			const result = await lookupWebFingerInternal(resource, options);
+			span.setStatus({ code: result === null ? SpanStatusCode.ERROR : SpanStatusCode.OK });
+			return result;
+		} catch (error) {
+			span.setStatus({
+				code: SpanStatusCode.ERROR,
+				message: String(error)
+			});
+			throw error;
+		} finally {
+			span.end();
+		}
+	});
+}
+async function lookupWebFingerInternal(resource, options = {}) {
+	if (typeof resource === "string") resource = new URL(resource);
+	let protocol = "https:";
+	let server;
+	if (resource.protocol === "acct:") {
+		const atPos = resource.pathname.lastIndexOf("@");
+		if (atPos < 0) return null;
+		server = resource.pathname.substring(atPos + 1);
+		if (server === "") return null;
+	} else {
+		protocol = resource.protocol;
+		server = resource.host;
+	}
+	let url = new URL(`${protocol}//${server}/.well-known/webfinger`);
+	url.searchParams.set("resource", resource.href);
+	let redirected = 0;
+	while (true) {
+		logger.debug("Fetching WebFinger resource descriptor from {url}...", { url: url.href });
+		let response;
+		if (options.allowPrivateAddress !== true) try {
+			await validatePublicUrl(url.href);
+		} catch (e) {
+			if (e instanceof UrlError) {
+				logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
+				return null;
+			}
+			throw e;
+		}
+		try {
+			response = await fetch(url, {
+				headers: {
+					Accept: "application/jrd+json",
+					"User-Agent": typeof options.userAgent === "string" ? options.userAgent : getUserAgent(options.userAgent)
+				},
+				redirect: "manual",
+				signal: options.signal
+			});
+		} catch (error) {
+			logger.debug("Failed to fetch WebFinger resource descriptor: {error}", {
+				url: url.href,
+				error
+			});
+			return null;
+		}
+		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
+			redirected++;
+			const maxRedirection = options.maxRedirection ?? DEFAULT_MAX_REDIRECTION;
+			if (redirected >= maxRedirection) {
+				logger.error("Too many redirections ({redirections}) while fetching WebFinger resource descriptor.", { redirections: redirected });
+				return null;
+			}
+			const redirectedUrl = new URL(response.headers.get("Location"), response.url == null || response.url === "" ? url : response.url);
+			if (redirectedUrl.protocol !== url.protocol) {
+				logger.error("Redirected to a different protocol ({protocol} to {redirectedProtocol}) while fetching WebFinger resource descriptor.", {
+					protocol: url.protocol,
+					redirectedProtocol: redirectedUrl.protocol
+				});
+				return null;
+			}
+			url = redirectedUrl;
+			continue;
+		}
+		if (!response.ok) {
+			logger.debug("Failed to fetch WebFinger resource descriptor: {status} {statusText}.", {
+				url: url.href,
+				status: response.status,
+				statusText: response.statusText
+			});
+			return null;
+		}
+		try {
+			return await response.json();
+		} catch (e) {
+			if (e instanceof SyntaxError) {
+				logger.debug("Failed to parse WebFinger resource descriptor as JSON: {error}", { error: e });
+				return null;
+			}
+			throw e;
+		}
+	}
+}
+
+//#endregion
+export { deno_default, lookupWebFinger };

package/dist/{lookup-DNQyH8UQ.js → lookup-BoiLMtAx.js}

@@ -3,121 +3,15 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Object as Object$1, deno_default, getDocumentLoader, getTypeId, lookupWebFinger } from "./type-I68qwqmo.js";
-import { cloneDeep, delay } from "es-toolkit";
+import { deno_default } from "./deno-BTeveqhY.js";
+import { Object as Object$1 } from "./vocab-C3nSleOZ.js";
+import { lookupWebFinger } from "./lookup-yv_aH7K7.js";
+import { getTypeId } from "./type-BSNcIxTd.js";
 import { getLogger } from "@logtape/logtape";
+import { delay } from "es-toolkit";
+import { getDocumentLoader } from "@fedify/vocab-runtime";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
-import { Router } from "uri-template-router";
-import { parseTemplate } from "url-template";
 
-//#region src/federation/router.ts
-function cloneInnerRouter(router) {
-	const clone = new Router();
-	clone.nid = router.nid;
-	clone.fsm = cloneDeep(router.fsm);
-	clone.routeSet = new Set(router.routeSet);
-	clone.templateRouteMap = new Map(router.templateRouteMap);
-	clone.valueRouteMap = new Map(router.valueRouteMap);
-	clone.hierarchy = cloneDeep(router.hierarchy);
-	return clone;
-}
-/**
-* URL router and constructor based on URI Template
-* ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
-*/
-var Router$1 = class Router$1 {
-	#router;
-	#templates;
-	#templateStrings;
-	/**
-	* Whether to ignore trailing slashes when matching paths.
-	* @since 1.6.0
-	*/
-	trailingSlashInsensitive;
-	/**
-	* Create a new {@link Router}.
-	* @param options Options for the router.
-	*/
-	constructor(options = {}) {
-		this.#router = new Router();
-		this.#templates = {};
-		this.#templateStrings = {};
-		this.trailingSlashInsensitive = options.trailingSlashInsensitive ?? false;
-	}
-	clone() {
-		const clone = new Router$1({ trailingSlashInsensitive: this.trailingSlashInsensitive });
-		clone.#router = cloneInnerRouter(this.#router);
-		clone.#templates = { ...this.#templates };
-		clone.#templateStrings = { ...this.#templateStrings };
-		return clone;
-	}
-	/**
-	* Checks if a path name exists in the router.
-	* @param name The name of the path.
-	* @returns `true` if the path name exists, otherwise `false`.
-	*/
-	has(name) {
-		return name in this.#templates;
-	}
-	/**
-	* Adds a new path rule to the router.
-	* @param template The path pattern.
-	* @param name The name of the path.
-	* @returns The names of the variables in the path pattern.
-	*/
-	add(template, name) {
-		if (!template.startsWith("/")) throw new RouterError("Path must start with a slash.");
-		const rule = this.#router.addTemplate(template, {}, name);
-		this.#templates[name] = parseTemplate(template);
-		this.#templateStrings[name] = template;
-		return new Set(rule.variables.map((v) => v.varname));
-	}
-	/**
-	* Resolves a path name and values from a URL, if any match.
-	* @param url The URL to resolve.
-	* @returns The name of the path and its values, if any match.  Otherwise,
-	*          `null`.
-	*/
-	route(url) {
-		let match = this.#router.resolveURI(url);
-		if (match == null) {
-			if (!this.trailingSlashInsensitive) return null;
-			url = url.endsWith("/") ? url.replace(/\/+$/, "") : `${url}/`;
-			match = this.#router.resolveURI(url);
-			if (match == null) return null;
-		}
-		return {
-			name: match.matchValue,
-			template: this.#templateStrings[match.matchValue],
-			values: match.params
-		};
-	}
-	/**
-	* Constructs a URL/path from a path name and values.
-	* @param name The name of the path.
-	* @param values The values to expand the path with.
-	* @returns The URL/path, if the name exists.  Otherwise, `null`.
-	*/
-	build(name, values) {
-		if (name in this.#templates) return this.#templates[name].expand(values);
-		return null;
-	}
-};
-/**
-* An error thrown by the {@link Router}.
-*/
-var RouterError = class extends Error {
-	/**
-	* Create a new {@link RouterError}.
-	* @param message The error message.
-	*/
-	constructor(message) {
-		super(message);
-		this.name = "RouterError";
-	}
-};
-
-//#endregion
 //#region src/vocab/handle.ts
 /**
 * Regular expression to match a fediverse handle in the format `@user@server`
@@ -224,9 +118,14 @@ async function lookupObject(identifier, options = {}) {
 				if (result.id != null) span.setAttribute("activitypub.object.id", result.id.href);
 				span.setAttribute("activitypub.object.type", getTypeId(result).href);
 				if (result.replyTargetIds.length > 0) span.setAttribute("activitypub.object.in_reply_to", result.replyTargetIds.map((id) => id.href));
+				span.addEvent("activitypub.object.fetched", {
+					"activitypub.object.type": getTypeId(result).href,
+					"activitypub.object.json": JSON.stringify(await result.toJsonLd(options))
+				});
 			}
 			return result;
 		} catch (error) {
+			span.recordException(error);
 			span.setStatus({
 				code: SpanStatusCode.ERROR,
 				message: String(error)
@@ -240,14 +139,13 @@ async function lookupObject(identifier, options = {}) {
 async function lookupObjectInternal(identifier, options = {}) {
 	const documentLoader = options.documentLoader ?? getDocumentLoader({ userAgent: options.userAgent });
 	if (typeof identifier === "string") identifier = toAcctUrl(identifier) ?? new URL(identifier);
-	let document = null;
+	let remoteDoc = null;
 	if (identifier.protocol === "http:" || identifier.protocol === "https:") try {
-		const remoteDoc = await documentLoader(identifier.href, { signal: options.signal });
-		document = remoteDoc.document;
+		remoteDoc = await documentLoader(identifier.href, { signal: options.signal });
 	} catch (error) {
 		logger.debug("Failed to fetch remote document:\n{error}", { error });
 	}
-	if (document == null) {
+	if (remoteDoc == null) {
 		const jrd = await lookupWebFinger(identifier, {
 			userAgent: options.userAgent,
 			tracerProvider: options.tracerProvider,
@@ -256,10 +154,9 @@ async function lookupObjectInternal(identifier, options = {}) {
 		});
 		if (jrd?.links == null) return null;
 		for (const l of jrd.links) {
-			if (l.type !== "application/activity+json" && !l.type?.match(/application\/ld\+json;\s*profile="https:\/\/www.w3.org\/ns\/activitystreams"/) || l.rel !== "self") continue;
+			if (l.type !== "application/activity+json" && !l.type?.match(/application\/ld\+json;\s*profile="https:\/\/www.w3.org\/ns\/activitystreams"/) || l.rel !== "self" || l.href == null) continue;
 			try {
-				const remoteDoc = await documentLoader(l.href, { signal: options.signal });
-				document = remoteDoc.document;
+				remoteDoc = await documentLoader(l.href, { signal: options.signal });
 				break;
 			} catch (error) {
 				logger.debug("Failed to fetch remote document:\n{error}", { error });
@@ -267,23 +164,34 @@ async function lookupObjectInternal(identifier, options = {}) {
 			}
 		}
 	}
-	if (document == null) return null;
+	if (remoteDoc == null) return null;
+	let object;
 	try {
-		return await Object$1.fromJsonLd(document, {
+		object = await Object$1.fromJsonLd(remoteDoc.document, {
 			documentLoader,
 			contextLoader: options.contextLoader,
-			tracerProvider: options.tracerProvider
+			tracerProvider: options.tracerProvider,
+			baseUrl: new URL(remoteDoc.documentUrl)
 		});
 	} catch (error) {
 		if (error instanceof TypeError) {
 			logger.debug("Failed to parse JSON-LD document: {error}\n{document}", {
-				error,
-				document
+				...remoteDoc,
+				error
 			});
 			return null;
 		}
 		throw error;
 	}
+	if (options.crossOrigin !== "trust" && object.id != null && object.id.origin !== new URL(remoteDoc.documentUrl).origin) {
+		if (options.crossOrigin === "throw") throw new Error(`The object's @id (${object.id.href}) has a different origin than the document URL (${remoteDoc.documentUrl}); refusing to return the object.  If you want to bypass this check and are aware of the security implications, set the crossOrigin option to "trust".`);
+		logger.warn("The object's @id ({objectId}) has a different origin than the document URL ({documentUrl}); refusing to return the object.  If you want to bypass this check and are aware of the security implications, set the crossOrigin option to \"trust\".", {
+			...remoteDoc,
+			objectId: object.id.href
+		});
+		return null;
+	}
+	return object;
 }
 /**
 * Traverses a collection, yielding each item in the collection.
@@ -319,4 +227,4 @@ async function* traverseCollection(collection, options = {}) {
 }
 
 //#endregion
-export { Router$1 as Router, RouterError, lookupObject, traverseCollection };
+export { lookupObject, traverseCollection };

package/dist/{lookup-BHYMosdS.js → lookup-yv_aH7K7.js}

@@ -1,9 +1,11 @@
 
       import { Temporal } from "@js-temporal/polyfill";
       import { URLPattern } from "urlpattern-polyfill";
+      globalThis.addEventListener = () => {};
     
-import { UrlError, deno_default, getUserAgent, validatePublicUrl } from "./docloader-BlVueewg.js";
+import { deno_default } from "./deno-BTeveqhY.js";
 import { getLogger } from "@logtape/logtape";
+import { UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 
 //#region src/webfinger/lookup.ts