@fedify/fedify 1.8.1-pr.315.1091 → 1.8.1-pr.318.1225

package/dist/{lookup-BYiP0j0F.js → lookup-DcB1UuZA.js}

@@ -3,14 +3,121 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default, getDocumentLoader } from "./docloader-CJ7eOrpZ.js";
-import { Object as Object$1 } from "./vocab-dw0HG0EQ.js";
-import { lookupWebFinger } from "./lookup-CEbB0_t_.js";
-import { getTypeId } from "./type-D2s5lmbZ.js";
-import { delay } from "es-toolkit";
+import { Object as Object$1, deno_default, getDocumentLoader, getTypeId, lookupWebFinger } from "./type-CFzYOYUt.js";
+import { cloneDeep, delay } from "es-toolkit";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
+import { Router } from "uri-template-router";
+import { parseTemplate } from "url-template";
 
+//#region 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 vocab/handle.ts
 /**
 * Regular expression to match a fediverse handle in the format `@user@server`
@@ -135,7 +242,7 @@ async function lookupObjectInternal(identifier, options = {}) {
 	if (typeof identifier === "string") identifier = toAcctUrl(identifier) ?? new URL(identifier);
 	let document = null;
 	if (identifier.protocol === "http:" || identifier.protocol === "https:") try {
-		const remoteDoc = await documentLoader(identifier.href, { signal: options.signal });
+		const remoteDoc = await documentLoader(identifier.href);
 		document = remoteDoc.document;
 	} catch (error) {
 		logger.debug("Failed to fetch remote document:\n{error}", { error });
@@ -144,14 +251,13 @@ async function lookupObjectInternal(identifier, options = {}) {
 		const jrd = await lookupWebFinger(identifier, {
 			userAgent: options.userAgent,
 			tracerProvider: options.tracerProvider,
-			allowPrivateAddress: "allowPrivateAddress" in options && options.allowPrivateAddress === true,
-			signal: options.signal
+			allowPrivateAddress: "allowPrivateAddress" in options && options.allowPrivateAddress === true
 		});
 		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;
 			try {
-				const remoteDoc = await documentLoader(l.href, { signal: options.signal });
+				const remoteDoc = await documentLoader(l.href);
 				document = remoteDoc.document;
 				break;
 			} catch (error) {
@@ -212,4 +318,4 @@ async function* traverseCollection(collection, options = {}) {
 }
 
 //#endregion
-export { lookupObject, traverseCollection };
+export { Router$1 as Router, RouterError, lookupObject, traverseCollection };

package/dist/{lookup-_XgQq_BY.js → lookup-mq8Ba5Kb.js}

@@ -2,7 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
       import { URLPattern } from "urlpattern-polyfill";
     
-import { UrlError, deno_default, getUserAgent, validatePublicUrl } from "./docloader-BindvZ7y.js";
+import { UrlError, deno_default, getUserAgent, validatePublicUrl } from "./docloader-DfooRmPz.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 
@@ -79,8 +79,7 @@ async function lookupWebFingerInternal(resource, options = {}) {
 					Accept: "application/jrd+json",
 					"User-Agent": typeof options.userAgent === "string" ? options.userAgent : getUserAgent(options.userAgent)
 				},
-				redirect: "manual",
-				signal: options.signal
+				redirect: "manual"
 			});
 		} catch (error) {
 			logger.debug("Failed to fetch WebFinger resource descriptor: {error}", {

package/dist/{lookup-m3U6KA0u.d.ts → lookup-tSXYzgYs.d.ts}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { GetUserAgentOptions } from "./docloader-DtGccyuM.js";
+import { GetUserAgentOptions } from "./docloader-CLolPVL_.js";
 import { TracerProvider } from "@opentelemetry/api";
 
 //#region webfinger/jrd.d.ts
@@ -89,12 +89,6 @@ interface LookupWebFingerOptions {
    * is used.
    */
   tracerProvider?: TracerProvider;
-  /**
-   * AbortSignal for cancelling the request.
-   * @since 1.8.0
-   * @
-   */
-  signal?: AbortSignal;
 }
 /**
  * Looks up a WebFinger resource.