@fedify/fedify 1.0.0-dev.400 → 1.0.0-dev.404

package/esm/webfinger/handler.js

@@ -4,7 +4,7 @@ import { Link as LinkObject } from "../vocab/mod.js";
 const logger = getLogger(["fedify", "webfinger", "server"]);
 /**
  * Handles a WebFinger request.  You would not typically call this function
- * directly, but instead use {@link Federation.handle} method.
+ * directly, but instead use {@link Federation.fetch} method.
  * @param request The WebFinger request to handle.
  * @param parameters The parameters for handling the request.
  * @returns The response to the request.
@@ -30,7 +30,7 @@ export async function handleWebFinger(request, { context, actorDispatcher, actor
         logger.error("Actor dispatcher is not set.");
         return await onNotFound(request);
     }
-    let handle;
+    let identifier;
     const uriParsed = context.parseUri(resourceUrl);
     if (uriParsed?.type != "actor") {
         const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
@@ -40,12 +40,12 @@ export async function handleWebFinger(request, { context, actorDispatcher, actor
         const username = match[1];
         if (actorHandleMapper == null) {
             logger.error("No actor handle mapper is set; use the WebFinger username {username}" +
-                " as the actor's internal handle.", { username });
-            handle = username;
+                " as the actor's internal identifier.", { username });
+            identifier = username;
         }
         else {
-            handle = await actorHandleMapper(context, username);
-            if (handle == null) {
+            identifier = await actorHandleMapper(context, username);
+            if (identifier == null) {
                 logger.error("Actor {username} not found.", { username });
                 return await onNotFound(request);
             }
@@ -53,17 +53,17 @@ export async function handleWebFinger(request, { context, actorDispatcher, actor
         resourceUrl = new URL(`acct:${username}@${context.url.host}`);
     }
     else {
-        handle = uriParsed.handle;
+        identifier = uriParsed.identifier;
     }
-    const actor = await actorDispatcher(context, handle);
+    const actor = await actorDispatcher(context, identifier);
     if (actor == null) {
-        logger.error("Actor {handle} not found.", { handle });
+        logger.error("Actor {identifier} not found.", { identifier });
         return await onNotFound(request);
     }
     const links = [
         {
             rel: "self",
-            href: context.getActorUri(handle).href,
+            href: context.getActorUri(identifier).href,
             type: "application/activity+json",
         },
     ];
@@ -95,11 +95,11 @@ export async function handleWebFinger(request, { context, actorDispatcher, actor
     }
     const jrd = {
         subject: resourceUrl.href,
-        aliases: resourceUrl.href === context.getActorUri(handle).href
+        aliases: resourceUrl.href === context.getActorUri(identifier).href
             ? (actor.preferredUsername == null
                 ? []
                 : [`acct:${actor.preferredUsername}@${context.url.host}`])
-            : [context.getActorUri(handle).href],
+            : [context.getActorUri(identifier).href],
         links,
     };
     return new Response(JSON.stringify(jrd), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "1.0.0-dev.400+d51ab63e",
+  "version": "1.0.0-dev.404+6397ee14",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",

package/types/federation/callback.d.ts

@@ -17,25 +17,27 @@ export type NodeInfoDispatcher<TContextData> = (context: RequestContext<TContext
  *
  * @typeParam TContextData The context data to pass to the {@link Context}.
  * @param context The request context.
- * @param handle The actor's handle.
+ * @param identifier The actor's internal identifier or username.
  */
-export type ActorDispatcher<TContextData> = (context: RequestContext<TContextData>, handle: string) => Actor | null | Promise<Actor | null>;
+export type ActorDispatcher<TContextData> = (context: RequestContext<TContextData>, identifier: string) => Actor | null | Promise<Actor | null>;
 /**
  * A callback that dispatches key pairs for an actor.
  *
  * @typeParam TContextData The context data to pass to the {@link Context}.
  * @param context The context.
- * @param handle The actor's handle.
+ * @param identifier The actor's internal identifier or username.
  * @returns The key pairs.
  * @since 0.10.0
  */
-export type ActorKeyPairsDispatcher<TContextData> = (context: Context<TContextData>, handle: string) => dntShim.CryptoKeyPair[] | Promise<dntShim.CryptoKeyPair[]>;
+export type ActorKeyPairsDispatcher<TContextData> = (context: Context<TContextData>, identifier: string) => dntShim.CryptoKeyPair[] | Promise<dntShim.CryptoKeyPair[]>;
 /**
  * A callback that maps a WebFinger username to the corresponding actor's
- * internal handle, or `null` if the username is not found.
+ * internal identifier, or `null` if the username is not found.
  * @typeParam TContextData The context data to pass to the {@link Context}.
  * @param context The context.
  * @param username The WebFinger username.
+ * @returns The actor's internal identifier, or `null` if the username is not
+ *          found.
  * @since 0.15.0
  */
 export type ActorHandleMapper<TContextData> = (context: Context<TContextData>, username: string) => string | null | Promise<string | null>;
@@ -57,18 +59,23 @@ export type ObjectDispatcher<TContextData, TObject extends Object, TParam extend
  * @typeParam TContextData The context data to pass to the `TContext`.
  * @typeParam TFilter The type of the filter, if any.
  * @param context The context.
- * @param handle The handle of the collection owner.
+ * @param identifier The internal identifier or the username of the collection
+ *                   owner.
  * @param cursor The cursor to start the collection from, or `null` to dispatch
  *               the entire collection without pagination.
  * @param filter The filter to apply to the collection, if any.
  */
-export type CollectionDispatcher<TItem, TContext extends Context<TContextData>, TContextData, TFilter> = (context: TContext, handle: string, cursor: string | null, filter?: TFilter) => PageItems<TItem> | null | Promise<PageItems<TItem> | null>;
+export type CollectionDispatcher<TItem, TContext extends Context<TContextData>, TContextData, TFilter> = (context: TContext, identifier: string, cursor: string | null, filter?: TFilter) => PageItems<TItem> | null | Promise<PageItems<TItem> | null>;
 /**
  * A callback that counts the number of items in a collection.
  *
  * @typeParam TContextData The context data to pass to the {@link Context}.
+ * @param context The context.
+ * @param identifier The internal identifier or the username of the collection
+ *                   owner.
+ * @param filter The filter to apply to the collection, if any.
  */
-export type CollectionCounter<TContextData, TFilter> = (context: RequestContext<TContextData>, handle: string, filter?: TFilter) => number | bigint | null | Promise<number | bigint | null>;
+export type CollectionCounter<TContextData, TFilter> = (context: RequestContext<TContextData>, identifier: string, filter?: TFilter) => number | bigint | null | Promise<number | bigint | null>;
 /**
  * A callback that returns a cursor for a collection.
  *
@@ -77,10 +84,11 @@ export type CollectionCounter<TContextData, TFilter> = (context: RequestContext<
  * @typeParam TContextData The context data to pass to the {@link Context}.
  * @typeParam TFilter The type of the filter, if any.
  * @param context The context.
- * @param handle The handle of the collection owner.
+ * @param identifier The internal identifier or the username of the collection
+ *                   owner.
  * @param filter The filter to apply to the collection, if any.
  */
-export type CollectionCursor<TContext extends Context<TContextData>, TContextData, TFilter> = (context: TContext, handle: string, filter?: TFilter) => string | null | Promise<string | null>;
+export type CollectionCursor<TContext extends Context<TContextData>, TContextData, TFilter> = (context: TContext, identifier: string, filter?: TFilter) => string | null | Promise<string | null>;
 /**
  * A callback that listens for activities in an inbox.
  *
@@ -103,14 +111,23 @@ export type InboxErrorHandler<TContextData> = (context: Context<TContextData>, e
  *
  * @typeParam TContextData The context data to pass to the {@link Context}.
  * @param context The context.
- * @returns The handle of the actor or the key pair for the authenticated
- *          document loader of the {@link Context} passed to the shared inbox
- *          listener.  If `null` is returned, the request is not authorized.
+ * @returns The username or the internal identifier of the actor or the key pair
+ *          for the authenticated document loader of the {@link Context} passed
+ *          to the shared inbox listener.  If `null` is returned, the request is
+ *          not authorized.
  * @since 0.11.0
  */
 export type SharedInboxKeyDispatcher<TContextData> = (context: Context<TContextData>) => SenderKeyPair | {
+    identifier: string;
+} | {
+    username: string;
+} | {
     handle: string;
 } | null | Promise<SenderKeyPair | {
+    identifier: string;
+} | {
+    username: string;
+} | {
     handle: string;
 } | null>;
 /**
@@ -127,7 +144,7 @@ export type OutboxErrorHandler = (error: Error, activity: Activity | null) => vo
  *
  * @typeParam TContextData The context data to pass to the {@link Context}.
  * @param context The request context.
- * @param handle The handle of the actor that is being requested.
+ * @param identifier The internal identifier of the actor that is being requested.
  * @param signedKey The key that was used to sign the request, or `null` if
  *                  the request was not signed or the signature was invalid.
  * @param signedKeyOwner The actor that owns the key that was used to sign the
@@ -137,7 +154,7 @@ export type OutboxErrorHandler = (error: Error, activity: Activity | null) => vo
  * @returns `true` if the request is authorized, `false` otherwise.
  * @since 0.7.0
  */
-export type AuthorizePredicate<TContextData> = (context: RequestContext<TContextData>, handle: string, signedKey: CryptographicKey | null, signedKeyOwner: Actor | null) => boolean | Promise<boolean>;
+export type AuthorizePredicate<TContextData> = (context: RequestContext<TContextData>, identifier: string, signedKey: CryptographicKey | null, signedKeyOwner: Actor | null) => boolean | Promise<boolean>;
 /**
  * A callback that determines if a request is authorized or not.
  *

package/types/federation/callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../src/federation/callback.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../src/federation/callback.ts"],"names":[],"mappings":"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"}

package/types/federation/context.d.ts

@@ -49,12 +49,12 @@ export interface Context<TContextData> {
      */
     getNodeInfoUri(): URL;
     /**
-     * Builds the URI of an actor with the given handle.
-     * @param handle The actor's handle.
+     * Builds the URI of an actor with the given identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor's URI.
      * @throws {RouterError} If no actor dispatcher is available.
      */
-    getActorUri(handle: string): URL;
+    getActorUri(identifier: string): URL;
     /**
      * Builds the URI of an object with the given class and values.
      * @param cls The class of the object.
@@ -68,12 +68,12 @@ export interface Context<TContextData> {
         typeId: URL;
     }, values: Record<string, string>): URL;
     /**
-     * Builds the URI of an actor's outbox with the given handle.
-     * @param handle The actor's handle.
+     * Builds the URI of an actor's outbox with the given identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor's outbox URI.
      * @throws {RouterError} If no outbox dispatcher is available.
      */
-    getOutboxUri(handle: string): URL;
+    getOutboxUri(identifier: string): URL;
     /**
      * Builds the URI of the shared inbox.
      * @returns The shared inbox URI.
@@ -81,51 +81,53 @@ export interface Context<TContextData> {
      */
     getInboxUri(): URL;
     /**
-     * Builds the URI of an actor's inbox with the given handle.
-     * @param handle The actor's handle.
+     * Builds the URI of an actor's inbox with the given identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor's inbox URI.
      * @throws {RouterError} If no inbox listener is available.
      */
-    getInboxUri(handle: string): URL;
+    getInboxUri(identifier: string): URL;
     /**
-     * Builds the URI of an actor's following collection with the given handle.
-     * @param handle The actor's handle.
+     * Builds the URI of an actor's following collection with the given
+     * identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor's following collection URI.
      * @throws {RouterError} If no following collection is available.
      */
-    getFollowingUri(handle: string): URL;
+    getFollowingUri(identifier: string): URL;
     /**
-     * Builds the URI of an actor's followers collection with the given handle.
-     * @param handle The actor's handle.
+     * Builds the URI of an actor's followers collection with the given
+     * identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor's followers collection URI.
      * @throws {RouterError} If no followers collection is available.
      */
-    getFollowersUri(handle: string): URL;
+    getFollowersUri(identifier: string): URL;
     /**
-     * Builds the URI of an actor's liked collection with the given handle.
-     * @param handle The actor's handle.
+     * Builds the URI of an actor's liked collection with the given identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor's liked collection URI.
      * @throws {RouterError} If no liked collection is available.
      * @since 0.11.0
      */
-    getLikedUri(handle: string): URL;
+    getLikedUri(identifier: string): URL;
     /**
-     * Builds the URI of an actor's featured collection with the given handle.
-     * @param handle The actor's handle.
+     * Builds the URI of an actor's featured collection with the given identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor's featured collection URI.
      * @throws {RouterError} If no featured collection is available.
      * @since 0.11.0
      */
-    getFeaturedUri(handle: string): URL;
+    getFeaturedUri(identifier: string): URL;
     /**
      * Builds the URI of an actor's featured tags collection with the given
-     * handle.
-     * @param handle The actor's handle.
+     * identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor's featured tags collection URI.
      * @throws {RouterError} If no featured tags collection is available.
      * @since 0.11.0
      */
-    getFeaturedTagsUri(handle: string): URL;
+    getFeaturedTagsUri(identifier: string): URL;
     /**
      * Determines the type of the URI and extracts the associated data.
      * @param uri The URI to parse.
@@ -136,23 +138,27 @@ export interface Context<TContextData> {
     parseUri(uri: URL | null): ParseUriResult | null;
     /**
      * Gets the key pairs for an actor.
-     * @param handle The actor's handle.
+     * @param identifier The actor's identifier.
      * @returns An async iterable of the actor's key pairs.  It can be empty.
      * @since 0.10.0
      */
-    getActorKeyPairs(handle: string): Promise<ActorKeyPair[]>;
+    getActorKeyPairs(identifier: string): Promise<ActorKeyPair[]>;
     /**
      * Gets an authenticated {@link DocumentLoader} for the given identity.
      * Note that an authenticated document loader intentionally does not cache
      * the fetched documents.
      * @param identity The identity to get the document loader for.
-     *                 The actor's handle.
+     *                 The actor's identifier or username.
      * @returns The authenticated document loader.
      * @throws {Error} If the identity is not valid.
      * @throws {TypeError} If the key is invalid or unsupported.
      * @since 0.4.0
      */
     getDocumentLoader(identity: {
+        identifier: string;
+    } | {
+        username: string;
+    } | {
         handle: string;
     }): Promise<DocumentLoader>;
     /**
@@ -209,17 +215,22 @@ export interface Context<TContextData> {
     lookupObject(identifier: string | URL, options?: LookupObjectOptions): Promise<Object | null>;
     /**
      * Sends an activity to recipients' inboxes.
-     * @param sender The sender's handle or the sender's key pair(s).
+     * @param sender The sender's identifier or the sender's username or
+     *               the sender's key pair(s).
      * @param recipients The recipients of the activity.
      * @param activity The activity to send.
      * @param options Options for sending the activity.
      */
     sendActivity(sender: SenderKeyPair | SenderKeyPair[] | {
-        handle: string;
+        identifier: string;
+    } | {
+        username: string;
+    } | {
+        identifier: string;
     }, recipients: Recipient | Recipient[], activity: Activity, options?: SendActivityOptions): Promise<void>;
     /**
      * Sends an activity to the outboxes of the sender's followers.
-     * @param sender The sender's handle.
+     * @param sender The sender's identifier or the sender's username.
      * @param recipients In this case, it must be `"followers"`.
      * @param activity The activity to send.
      * @param options Options for sending the activity.
@@ -227,6 +238,10 @@ export interface Context<TContextData> {
      * @since 0.14.0
      */
     sendActivity(sender: {
+        identifier: string;
+    } | {
+        username: string;
+    } | {
         handle: string;
     }, recipients: "followers", activity: Activity, options?: SendActivityOptions): Promise<void>;
 }
@@ -243,13 +258,13 @@ export interface RequestContext<TContextData> extends Context<TContextData> {
      */
     readonly url: URL;
     /**
-     * Gets an {@link Actor} object for the given handle.
-     * @param handle The actor's handle.
+     * Gets an {@link Actor} object for the given identifier.
+     * @param identifier The actor's identifier.
      * @returns The actor object, or `null` if the actor is not found.
      * @throws {Error} If no actor dispatcher is available.
      * @since 0.7.0
      */
-    getActor(handle: string): Promise<Actor | null>;
+    getActor(identifier: string): Promise<Actor | null>;
     /**
      * Gets an object of the given class with the given values.
      * @param cls The class to instantiate.
@@ -303,12 +318,17 @@ export interface InboxContext<TContextData> extends Context<TContextData> {
      * Integrity Proofs will not be added.  Therefore, if the activity is not
      * signed (i.e., it has neither Linked Data Signatures nor Object Integrity
      * Proofs), the recipient probably will not trust the activity.
-     * @param forwarder The forwarder's handle or the forwarder's key pair(s).
+     * @param forwarder The forwarder's identifier or the forwarder's username
+     *                  or the forwarder's key pair(s).
      * @param recipients The recipients of the activity.
      * @param options Options for forwarding the activity.
      * @since 1.0.0
      */
     forwardActivity(forwarder: SenderKeyPair | SenderKeyPair[] | {
+        identifier: string;
+    } | {
+        username: string;
+    } | {
         handle: string;
     }, recipients: Recipient | Recipient[], options?: ForwardActivityOptions): Promise<void>;
     /**
@@ -318,12 +338,16 @@ export interface InboxContext<TContextData> extends Context<TContextData> {
      * Integrity Proofs will not be added.  Therefore, if the activity is not
      * signed (i.e., it has neither Linked Data Signatures nor Object Integrity
      * Proofs), the recipient probably will not trust the activity.
-     * @param forwarder The forwarder's handle.
+     * @param forwarder The forwarder's identifier or the forwarder's username.
      * @param recipients In this case, it must be `"followers"`.
      * @param options Options for forwarding the activity.
      * @since 1.0.0
      */
     forwardActivity(forwarder: {
+        identifier: string;
+    } | {
+        username: string;
+    } | {
         handle: string;
     }, recipients: "followers", options?: ForwardActivityOptions): Promise<void>;
 }
@@ -335,72 +359,87 @@ export type ParseUriResult =
  * The case of an actor URI.
  */
 {
-    type: "actor";
-    handle: string;
+    readonly type: "actor";
+    readonly identifier: string;
+    readonly handle: string;
 }
 /**
  * The case of an object URI.
  */
  | {
-    type: "object";
-    class: (new (...args: any[]) => Object) & {
+    readonly type: "object";
+    readonly class: (new (...args: any[]) => Object) & {
         typeId: URL;
     };
-    typeId: URL;
-    values: Record<string, string>;
+    readonly typeId: URL;
+    readonly values: Record<string, string>;
+}
+/**
+ * The case of an shared inbox URI.
+ */
+ | {
+    readonly type: "inbox";
+    readonly identifier: undefined;
+    readonly handle: undefined;
 }
 /**
- * The case of an inbox URI.  If `handle` is `undefined`,
- * it is a shared inbox.
+ * The case of an personal inbox URI.
  */
  | {
-    type: "inbox";
-    handle?: string;
+    readonly type: "inbox";
+    readonly identifier: string;
+    readonly handle: string;
 }
 /**
  * The case of an outbox collection URI.
  */
  | {
-    type: "outbox";
-    handle: string;
+    readonly type: "outbox";
+    readonly identifier: string;
+    readonly handle: string;
 }
 /**
  * The case of a following collection URI.
  */
  | {
-    type: "following";
-    handle: string;
+    readonly type: "following";
+    readonly identifier: string;
+    readonly handle: string;
 }
 /**
  * The case of a followers collection URI.
  */
  | {
-    type: "followers";
-    handle: string;
+    readonly type: "followers";
+    readonly identifier: string;
+    readonly handle: string;
 }
 /**
  * The case of a liked collection URI.
  * @since 0.11.0
  */
  | {
-    type: "liked";
-    handle: string;
+    readonly type: "liked";
+    readonly identifier: string;
+    readonly handle: string;
 }
 /**
  * The case of a featured collection URI.
  * @since 0.11.0
  */
  | {
-    type: "featured";
-    handle: string;
+    readonly type: "featured";
+    readonly identifier: string;
+    readonly handle: string;
 }
 /**
  * The case of a featured tags collection URI.
  * @since 0.11.0
  */
  | {
-    type: "featuredTags";
-    handle: string;
+    readonly type: "featuredTags";
+    readonly identifier: string;
+    readonly handle: string;
 };
 /**
  * Options for {@link Context.sendActivity} method.

package/types/federation/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/federation/context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/federation/context.ts"],"names":[],"mappings":"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"}