@fedify/vocab 2.4.0-dev.2035 → 2.4.0-dev.2047

package/dist-tests/{actor-BX07d5tK.mjs → actor-chbmxipX.mjs}

@@ -1,13 +1,14 @@
 import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { H as Service, N as Organization, P as Person, a as Application, y as Group } from "./vocab-Dw_Vm0NE.mjs";
+import { H as Service, N as Organization, P as Person, a as Application, y as Group } from "./vocab-BJGPw--L.mjs";
 import { t as getTypeId } from "./type-BMdjm4Eg.mjs";
+import { canonicalizePortableUri, formatIri, fromCompatibleEf61Id, isGatewayUrl } from "@fedify/vocab-runtime";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { domainToASCII, domainToUnicode } from "node:url";
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.2035+d1f8f8e2";
+var version = "2.4.0-dev.2047+140b94db";
 //#endregion
 //#region src/actor.ts
 const ACTOR_DISCOVERY_HISTOGRAM_BUCKETS = [
@@ -49,6 +50,7 @@ function getActorDiscoveryInstruments(meterProvider) {
 function getActorDiscoveryRemoteHost(actor) {
 	const id = actor instanceof URL ? actor : actor.id;
 	if (id == null) return void 0;
+	if (isPortableActorId(id)) return actor instanceof URL ? void 0 : actor.gateway?.host;
 	return id.host === "" ? void 0 : id.host;
 }
 var ActorHandleNotFoundError = class extends TypeError {
@@ -108,6 +110,17 @@ function getActorClassByTypeName(typeName) {
 * await getActorHandle(new URL("https://fosstodon.org/users/hongminhee"));
 * ```
 *
+* For an [FEP-ef61] portable actor, whose ID is an `ap:` or `ap+ef61:` URI,
+* the domain is taken from the first gateway in the actor's `gateways` rather
+* than from its ID.  The handle is returned only if its WebFinger response
+* links back to the actor, since the actor's `gateways` are claimed by the
+* actor itself; a failed WebFinger lookup is not enough information to get
+* the handle.  A portable actor without `gateways` or
+* `preferredUsername`, or a portable actor URI (which does not tell its
+* gateways), is not supported.
+*
+* [FEP-ef61]: https://w3id.org/fep/ef61
+*
 * @param actor The actor or actor URI to get the handle from.
 * @param options The extra options for getting the actor handle.
 * @returns The actor handle.  It starts with `@` and is followed by the
@@ -152,6 +165,10 @@ async function getActorHandle(actor, options = {}) {
 }
 async function getActorHandleInternal(actor, options = {}) {
 	const actorId = actor instanceof URL ? actor : actor.id;
+	if (actorId != null && isPortableActorId(actorId)) {
+		if (actor instanceof URL) throw new ActorHandleNotFoundError();
+		return await getPortableActorHandle(actor, actorId, options);
+	}
 	if (actorId != null) {
 		const result = await lookupWebFinger(actorId, {
 			userAgent: options.userAgent,
@@ -173,6 +190,58 @@ async function getActorHandleInternal(actor, options = {}) {
 	if (!(actor instanceof URL) && actor.preferredUsername != null && actor.id != null) return normalizeActorHandle(`@${actor.preferredUsername}@${actor.id.host}`, options);
 	throw new ActorHandleNotFoundError();
 }
+function isPortableActorId(id) {
+	return id.protocol === "ap:" || id.protocol === "ap+ef61:";
+}
+/**
+* The reverse discovery of an FEP-ef61 portable actor's WebFinger address,
+* which takes the domain from the first gateway in its `gateways`.
+*/
+async function getPortableActorHandle(actor, actorId, options) {
+	const gateway = actor.gateway;
+	const username = actor.preferredUsername?.toString();
+	if (gateway == null || !isGatewayUrl(gateway) || username == null) throw new ActorHandleNotFoundError();
+	const canonicalId = canonicalizePortableUri(formatIri(actorId));
+	const handle = `acct:${username}@${gateway.host}`;
+	const result = await lookupWebFinger(handle, {
+		userAgent: options.userAgent,
+		tracerProvider: options.tracerProvider,
+		meterProvider: options.meterProvider
+	});
+	if (result == null || !linksToPortableActor(result, canonicalId)) throw new ActorHandleNotFoundError();
+	const subject = result.subject?.match(/^acct:([^@]+)@([^@]+)$/);
+	if (subject != null && result.subject !== handle) {
+		const subjectResult = await lookupWebFinger(result.subject, {
+			userAgent: options.userAgent,
+			tracerProvider: options.tracerProvider,
+			meterProvider: options.meterProvider
+		});
+		if (subjectResult != null && linksToPortableActor(subjectResult, canonicalId)) return normalizeActorHandle(`@${subject[1]}@${subject[2]}`, options);
+	}
+	return normalizeActorHandle(`@${username}@${gateway.host}`, options);
+}
+/**
+* Checks if the first ActivityStreams `self` link of a WebFinger response
+* identifies the portable actor, either by its portable ID or by
+* a compatible identifier.
+*/
+function linksToPortableActor(jrd, canonicalId) {
+	const link = jrd.links?.find((l) => l.rel === "self" && l.href != null && (l.type === "application/activity+json" || l.type?.match(/application\/ld\+json;\s*profile="https:\/\/www.w3.org\/ns\/activitystreams"/) != null));
+	if (link?.href == null) return false;
+	try {
+		let id;
+		if (/^ap(?:\+ef61)?:/i.test(link.href)) id = link.href;
+		else {
+			const portable = URL.canParse(link.href) ? fromCompatibleEf61Id(link.href) : null;
+			if (portable == null) return false;
+			id = formatIri(portable);
+		}
+		return canonicalizePortableUri(id) === canonicalId;
+	} catch (error) {
+		if (error instanceof TypeError) return false;
+		throw error;
+	}
+}
 async function verifyCrossOriginActorHandle(actorId, alias, userAgent, tracerProvider, meterProvider) {
 	const response = await lookupWebFinger(alias, {
 		userAgent,

package/dist-tests/actor.test.mjs

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { H as Service, N as Organization, P as Person, Z as __exportAll, a as Application, y as Group } from "./vocab-Dw_Vm0NE.mjs";
-import { t as esm_default } from "./esm-C_FjLvhG.mjs";
-import { a as normalizeActorHandle, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-BX07d5tK.mjs";
+import { H as Service, N as Organization, P as Person, Z as __exportAll, a as Application, y as Group } from "./vocab-BJGPw--L.mjs";
+import { t as esm_default } from "./esm-Df0Yo-Tp.mjs";
+import { a as normalizeActorHandle, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-chbmxipX.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
 //#region ../../node_modules/.pnpm/fast-check@3.23.2/node_modules/fast-check/lib/esm/check/precondition/PreconditionFailure.js

package/dist-tests/{esm-C_FjLvhG.mjs → esm-Df0Yo-Tp.mjs}

@@ -1,6 +1,6 @@
 import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { Q as __toESM, X as __commonJSMin } from "./vocab-Dw_Vm0NE.mjs";
+import { Q as __toESM, X as __commonJSMin } from "./vocab-BJGPw--L.mjs";
 //#endregion
 //#region ../../node_modules/.pnpm/regexparam@3.0.0/node_modules/regexparam/dist/index.mjs
 var import_glob_to_regexp = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {