@fedify/fedify 1.8.0-dev.952 → 1.8.0-dev.959

package/dist/{vocab-CKWclA_p.js → vocab-Cmyrj4bm.js}

@@ -2,20 +2,97 @@
       import { Temporal } from "@js-temporal/polyfill";
       import { URLPattern } from "urlpattern-polyfill";
     
-import { deno_default, getDocumentLoader } from "./docloader-onqGGiQb.js";
-import { Object as Object$1, getTypeId } from "./actor-BWFxNSnR.js";
-import { lookupWebFinger } from "./lookup-C7tY3Xdt.js";
+import { deno_default, getDocumentLoader } from "./docloader-o4PMHdEx.js";
+import { Object as Object$1, getTypeId } from "./actor-DewPM7FL.js";
+import { lookupWebFinger } from "./lookup-C0ttAuWJ.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { delay } from "es-toolkit";
 
+//#region vocab/handle.ts
+/**
+* Regular expression to match a fediverse handle in the format `@user@server`
+* or `user@server`.  The `user` part can contain alphanumeric characters and
+* some special characters except `@`.  The `server` part is all characters
+* after the `@` symbol in the middle.
+*/
+const handleRegexp = /^@?((?:[-A-Za-z0-9._~!$&'()*+,;=]|%[A-Fa-f0-9]{2})+)@([^@]+)$/;
+/**
+* Parses a fediverse handle in the format `@user@server` or `user@server`.
+* The `user` part can contain alphanumeric characters and some special
+* characters except `@`.  The `server` part is all characters after the `@`
+* symbol in the middle.
+*
+* @example
+* ```typescript
+* const handle = parseFediverseHandle("@username@example.com");
+* console.log(handle?.username); // "username"
+* console.log(handle?.host);     // "example.com"
+* ```
+*
+* @param handle - The fediverse handle string to parse.
+* @returns A {@link FediverseHandle} object with `username` and `host`
+*          if the input is valid; otherwise `null`.
+* @since 1.8.0
+*/
+function parseFediverseHandle(handle) {
+	const match = handleRegexp.exec(handle);
+	if (match) return {
+		username: match[1],
+		host: match[2]
+	};
+	return null;
+}
+/**
+* Checks if a string is a valid fediverse handle in the format `@user@server`
+* or `user@server`.  The `user` part can contain alphanumeric characters and
+* some special characters except `@`.  The `server` part is all characters
+* after the `@` symbol in the middle.
+*
+* @example
+* ```typescript
+* console.log(isFediverseHandle("@username@example.com")); // true
+* console.log(isFediverseHandle("username@example.com"));  // true
+* console.log(isFediverseHandle("@username@"));            // false
+* ```
+*
+* @param handle - The string to test as a fediverse handle.
+* @returns `true` if the string matches the fediverse handle pattern;
+*          otherwise `false`.
+* @since 1.8.0
+*/
+function isFediverseHandle(handle) {
+	return handleRegexp.test(handle);
+}
+/**
+* Converts a fediverse handle in the format `@user@server` or `user@server`
+* to an `acct:` URI, which is a URL-like identifier for ActivityPub actors.
+*
+* @example
+* ```typescript
+* const identifier = toAcctUrl("@username@example.com");
+* console.log(identifier?.href); // "acct:username@example.com"
+* ```
+*
+* @param handle - The fediverse handle string to convert.
+* @returns A `URL` object representing the `acct:` URI if conversion succeeds;
+*          otherwise `null`.
+* @since 1.8.0
+*/
+function toAcctUrl(handle) {
+	const parsed = parseFediverseHandle(handle);
+	if (!parsed) return null;
+	const identifier = new URL(`acct:${parsed.username}@${parsed.host}`);
+	return identifier;
+}
+
+//#endregion
 //#region vocab/lookup.ts
 const logger = getLogger([
 	"fedify",
 	"vocab",
 	"lookup"
 ]);
-const handleRegexp = /^@?((?:[-A-Za-z0-9._~!$&'()*+,;=]|%[A-Fa-f0-9]{2})+)@([^@]+)$/;
 /**
 * Looks up an ActivityStreams object by its URI (including `acct:` URIs)
 * or a fediverse handle (e.g., `@user@server` or `user@server`).
@@ -74,11 +151,7 @@ async function lookupObject(identifier, options = {}) {
 }
 async function lookupObjectInternal(identifier, options = {}) {
 	const documentLoader = options.documentLoader ?? getDocumentLoader({ userAgent: options.userAgent });
-	if (typeof identifier === "string") {
-		const match = handleRegexp.exec(identifier);
-		if (match) identifier = `acct:${match[1]}@${match[2]}`;
-		identifier = new URL(identifier);
-	}
+	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);
@@ -169,4 +242,4 @@ async function* traverseCollection(collection, options = {}) {
 const PUBLIC_COLLECTION = new URL("https://www.w3.org/ns/activitystreams#Public");
 
 //#endregion
-export { PUBLIC_COLLECTION, lookupObject, traverseCollection };
+export { PUBLIC_COLLECTION, isFediverseHandle, lookupObject, parseFediverseHandle, toAcctUrl, traverseCollection };

package/dist/webfinger/handler.test.js

@@ -7,32 +7,32 @@ import { assertEquals } from "../assert_equals-C5gKCm6A.js";
 import "../assert-DwEa6glZ.js";
 import "../assert_instance_of-C9QtN-X9.js";
 import { MemoryKvStore } from "../kv-D7Yt6pnB.js";
-import { createFederation, handleWebFinger } from "../middleware-C37kF-sp.js";
-import "../docloader-BFuRHsay.js";
+import { createFederation, handleWebFinger } from "../middleware-DnRE18Ay.js";
+import "../docloader-zdP1pRCI.js";
 import "../url-kTAI6_KP.js";
 import "../semver-DWClQt_5.js";
-import "../client-yKecM_0d.js";
+import "../client--XbwNkCA.js";
 import "../router-D3UybECj.js";
 import "../types-C7C_l-jz.js";
 import "../multibase-DeCHcK8L.js";
-import { Image, Link, Person } from "../vocab-DPfUWFNl.js";
+import { Image, Link, Person } from "../vocab-BsVG3894.js";
 import "../langstr-DbWheeIS.js";
-import "../lookup-BT8SOdcA.js";
+import "../lookup-kaJG82XH.js";
 import "../type-D2s5lmbZ.js";
-import "../actor-EzU7ndeu.js";
-import "../key-kDZgr5No.js";
-import "../http-BkeuJbKU.js";
-import "../authdocloader-BQKkNzeH.js";
-import "../ld-BTb4k201.js";
-import "../owner-eYr4V3my.js";
-import "../proof-DMkP6wLl.js";
-import "../lookup-M0i1aD0a.js";
-import "../inbox-B33dAqgO.js";
-import "../builder-DbBHCZXD.js";
+import "../actor-DfR5oNcy.js";
+import "../key-BxTosl9N.js";
+import "../http-1qb2IzZT.js";
+import "../authdocloader-CcXLonaa.js";
+import "../ld-CGZ8UI2u.js";
+import "../owner-OkPEYrul.js";
+import "../proof-BCA5wNq_.js";
+import "../lookup-fnJznpaH.js";
+import "../inbox-DugEZEvU.js";
+import "../builder-uCnChNB-.js";
 import "../collection-Dfb0TPno.js";
-import "../keycache-Bnl-7eYm.js";
+import "../keycache-BwGzlsrb.js";
 import "../retry-BiIhZWgD.js";
-import "../send-qy1MbuwP.js";
+import "../send-adILR1KB.js";
 import { test } from "../testing-BZ0dJ4qn.js";
 import "../std__assert-B3iAixc-.js";
 import "../assert_rejects-DceVjUlD.js";
@@ -40,7 +40,7 @@ import "../assert_is_error-DQdKoRgb.js";
 import "../assert_not_equals-7pyUM3Ib.js";
 import "../assert_throws-DTDC_gwN.js";
 import "../docloader-09nVWLAZ.js";
-import { createRequestContext } from "../context-CKwXdbmG.js";
+import { createRequestContext } from "../context-BugaDoCZ.js";
 
 //#region webfinger/handler.test.ts
 test("handleWebFinger()", async (t) => {

package/dist/webfinger/lookup.test.js

@@ -6,9 +6,9 @@
 import { assertEquals } from "../assert_equals-C5gKCm6A.js";
 import "../assert-DwEa6glZ.js";
 import "../assert_instance_of-C9QtN-X9.js";
-import "../docloader-BFuRHsay.js";
+import "../docloader-zdP1pRCI.js";
 import "../url-kTAI6_KP.js";
-import { lookupWebFinger } from "../lookup-BT8SOdcA.js";
+import { lookupWebFinger } from "../lookup-kaJG82XH.js";
 import { test } from "../testing-BZ0dJ4qn.js";
 import "../std__assert-B3iAixc-.js";
 import "../assert_rejects-DceVjUlD.js";
@@ -117,6 +117,24 @@ test({
 		await t.step("redirection to private address", async () => {
 			assertEquals(await lookupWebFinger("acct:johndoe@example.com"), null);
 		});
+		esm_default.removeRoutes();
+		let redirectCount = 0;
+		esm_default.get("begin:https://example.com/.well-known/webfinger", () => {
+			redirectCount++;
+			if (redirectCount < 3) return {
+				status: 302,
+				headers: { Location: `/.well-known/webfinger?redirect=${redirectCount}` }
+			};
+			return { body: expected };
+		});
+		await t.step("custom maxRedirection", async () => {
+			redirectCount = 0;
+			assertEquals(await lookupWebFinger("acct:johndoe@example.com", { maxRedirection: 2 }), null);
+			redirectCount = 0;
+			assertEquals(await lookupWebFinger("acct:johndoe@example.com", { maxRedirection: 3 }), expected);
+			redirectCount = 0;
+			assertEquals(await lookupWebFinger("acct:johndoe@example.com"), expected);
+		});
 		esm_default.hardReset();
 	}
 });

package/dist/webfinger/mod.d.ts

@@ -2,6 +2,6 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import "../kv-DDdb1hMa.js";
 import "../docloader-BeCtcTOJ.js";
-import { Link, LookupWebFingerOptions, ResourceDescriptor, lookupWebFinger } from "../lookup-DHNtuVcT.js";
+import { Link, LookupWebFingerOptions, ResourceDescriptor, lookupWebFinger } from "../lookup-J_m4YZg0.js";
 import "../mod-GIh5OYxW.js";
 export { Link, LookupWebFingerOptions, ResourceDescriptor, lookupWebFinger };

package/dist/webfinger/mod.js

@@ -2,8 +2,8 @@
       import { Temporal } from "@js-temporal/polyfill";
       import { URLPattern } from "urlpattern-polyfill";
     
-import "../docloader-onqGGiQb.js";
-import { lookupWebFinger } from "../lookup-C7tY3Xdt.js";
+import "../docloader-o4PMHdEx.js";
+import { lookupWebFinger } from "../lookup-C0ttAuWJ.js";
 import "../webfinger-C3GIyXIg.js";
 
 export { lookupWebFinger };

package/dist/x/hono.d.ts

@@ -7,9 +7,9 @@ import "../vocab-By6mpzr-.js";
 import "../actor-B4TBtqRP.js";
 import "../http-CP2ZUALI.js";
 import "../owner-CEv_PfyK.js";
-import "../mod-BzLUzgBJ.js";
-import "../lookup-DHNtuVcT.js";
-import { Federation } from "../context-y90aX3KP.js";
+import "../mod-BFwgZ7_K.js";
+import "../lookup-J_m4YZg0.js";
+import { Federation } from "../context-CrSyJrIa.js";
 import "../mq-DYKDDJmp.js";
 
 //#region x/hono.d.ts

package/dist/x/sveltekit.d.ts

@@ -7,9 +7,9 @@ import "../vocab-By6mpzr-.js";
 import "../actor-B4TBtqRP.js";
 import "../http-CP2ZUALI.js";
 import "../owner-CEv_PfyK.js";
-import "../mod-BzLUzgBJ.js";
-import "../lookup-DHNtuVcT.js";
-import { Federation } from "../context-y90aX3KP.js";
+import "../mod-BFwgZ7_K.js";
+import "../lookup-J_m4YZg0.js";
+import { Federation } from "../context-CrSyJrIa.js";
 import "../mq-DYKDDJmp.js";
 
 //#region x/sveltekit.d.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "1.8.0-dev.952+553492a7",
+  "version": "1.8.0-dev.959+97d0dcbf",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",

package/dist/middleware-BYv6Ixgi.js

@@ -1,33 +0,0 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-C37kF-sp.js";
-import "./docloader-BFuRHsay.js";
-import "./url-kTAI6_KP.js";
-import "./semver-DWClQt_5.js";
-import "./client-yKecM_0d.js";
-import "./router-D3UybECj.js";
-import "./types-C7C_l-jz.js";
-import "./multibase-DeCHcK8L.js";
-import "./vocab-DPfUWFNl.js";
-import "./langstr-DbWheeIS.js";
-import "./lookup-BT8SOdcA.js";
-import "./type-D2s5lmbZ.js";
-import "./actor-EzU7ndeu.js";
-import "./key-kDZgr5No.js";
-import "./http-BkeuJbKU.js";
-import "./authdocloader-BQKkNzeH.js";
-import "./ld-BTb4k201.js";
-import "./owner-eYr4V3my.js";
-import "./proof-DMkP6wLl.js";
-import "./lookup-M0i1aD0a.js";
-import "./inbox-B33dAqgO.js";
-import "./builder-DbBHCZXD.js";
-import "./collection-Dfb0TPno.js";
-import "./keycache-Bnl-7eYm.js";
-import "./retry-BiIhZWgD.js";
-import "./send-qy1MbuwP.js";
-
-export { FederationImpl };

package/dist/middleware-DzQMeTkq.js

@@ -1,17 +0,0 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-    
-import "./transformers-ghwJuzGY.js";
-import "./docloader-onqGGiQb.js";
-import "./actor-BWFxNSnR.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-ClwV-KmF.js";
-import "./lookup-C7tY3Xdt.js";
-import "./key-Cn9gw2pj.js";
-import "./http-Dm8W6Xii.js";
-import "./proof-gll-kzgh.js";
-import "./types-Bzi8SON9.js";
-import "./authdocloader-h0v96Scc.js";
-import "./vocab-CKWclA_p.js";
-
-export { FederationImpl };