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

package/esm/federation/middleware.js

@@ -197,10 +197,10 @@ export class FederationImpl {
         const logger = getLogger(["fedify", "federation", "inbox"]);
         const baseUrl = new URL(message.baseUrl);
         let context = this.#createContext(baseUrl, ctxData);
-        if (message.handle) {
+        if (message.identifier != null) {
             context = this.#createContext(baseUrl, ctxData, {
                 documentLoader: await context.getDocumentLoader({
-                    handle: message.handle,
+                    identifier: message.identifier,
                 }),
             });
         }
@@ -208,7 +208,8 @@ export class FederationImpl {
             const identity = await this.sharedInboxKeyDispatcher(context);
             if (identity != null) {
                 context = this.#createContext(baseUrl, ctxData, {
-                    documentLoader: "handle" in identity
+                    documentLoader: "identifier" in identity || "username" in identity ||
+                        "handle" in identity
                         ? await context.getDocumentLoader(identity)
                         : context.getDocumentLoader(identity),
                 });
@@ -332,36 +333,41 @@ export class FederationImpl {
             throw new RouterError("Actor dispatcher already set.");
         }
         const variables = this.router.add(path, "actor");
-        if (variables.size !== 1 || !variables.has("handle")) {
-            throw new RouterError("Path for actor dispatcher must have one variable: {handle}");
+        if (variables.size !== 1 ||
+            !(variables.has("identifier") || variables.has("handle"))) {
+            throw new RouterError("Path for actor dispatcher must have one variable: {identifier}");
+        }
+        if (variables.has("handle")) {
+            getLogger(["fedify", "federation", "actor"]).warn("The {handle} variable in the actor dispatcher path is deprecated. " +
+                "Use {identifier} instead.");
         }
         const callbacks = {
-            dispatcher: async (context, handle) => {
-                const actor = await dispatcher(context, handle);
+            dispatcher: async (context, identifier) => {
+                const actor = await dispatcher(context, identifier);
                 if (actor == null)
                     return null;
                 const logger = getLogger(["fedify", "federation", "actor"]);
                 if (actor.id == null) {
                     logger.warn("Actor dispatcher returned an actor without an id property.  " +
-                        "Set the property with Context.getActorUri(handle).");
+                        "Set the property with Context.getActorUri(identifier).");
                 }
-                else if (actor.id.href != context.getActorUri(handle).href) {
+                else if (actor.id.href != context.getActorUri(identifier).href) {
                     logger.warn("Actor dispatcher returned an actor with an id property that " +
                         "does not match the actor URI.  Set the property with " +
-                        "Context.getActorUri(handle).");
+                        "Context.getActorUri(identifier).");
                 }
                 if (this.followingCallbacks != null &&
                     this.followingCallbacks.dispatcher != null) {
                     if (actor.followingId == null) {
                         logger.warn("You configured a following collection dispatcher, but the " +
                             "actor does not have a following property.  Set the property " +
-                            "with Context.getFollowingUri(handle).");
+                            "with Context.getFollowingUri(identifier).");
                     }
-                    else if (actor.followingId.href != context.getFollowingUri(handle).href) {
+                    else if (actor.followingId.href != context.getFollowingUri(identifier).href) {
                         logger.warn("You configured a following collection dispatcher, but the " +
                             "actor's following property does not match the following " +
                             "collection URI.  Set the property with " +
-                            "Context.getFollowingUri(handle).");
+                            "Context.getFollowingUri(identifier).");
                     }
                 }
                 if (this.followersCallbacks != null &&
@@ -369,13 +375,13 @@ export class FederationImpl {
                     if (actor.followersId == null) {
                         logger.warn("You configured a followers collection dispatcher, but the " +
                             "actor does not have a followers property.  Set the property " +
-                            "with Context.getFollowersUri(handle).");
+                            "with Context.getFollowersUri(identifier).");
                     }
-                    else if (actor.followersId.href != context.getFollowersUri(handle).href) {
+                    else if (actor.followersId.href != context.getFollowersUri(identifier).href) {
                         logger.warn("You configured a followers collection dispatcher, but the " +
                             "actor's followers property does not match the followers " +
                             "collection URI.  Set the property with " +
-                            "Context.getFollowersUri(handle).");
+                            "Context.getFollowersUri(identifier).");
                     }
                 }
                 if (this.outboxCallbacks != null &&
@@ -383,12 +389,12 @@ export class FederationImpl {
                     if (actor?.outboxId == null) {
                         logger.warn("You configured an outbox collection dispatcher, but the " +
                             "actor does not have an outbox property.  Set the property " +
-                            "with Context.getOutboxUri(handle).");
+                            "with Context.getOutboxUri(identifier).");
                     }
-                    else if (actor.outboxId.href != context.getOutboxUri(handle).href) {
+                    else if (actor.outboxId.href != context.getOutboxUri(identifier).href) {
                         logger.warn("You configured an outbox collection dispatcher, but the " +
                             "actor's outbox property does not match the outbox collection " +
-                            "URI.  Set the property with Context.getOutboxUri(handle).");
+                            "URI.  Set the property with Context.getOutboxUri(identifier).");
                     }
                 }
                 if (this.likedCallbacks != null &&
@@ -396,12 +402,12 @@ export class FederationImpl {
                     if (actor?.likedId == null) {
                         logger.warn("You configured a liked collection dispatcher, but the " +
                             "actor does not have a liked property.  Set the property " +
-                            "with Context.getLikedUri(handle).");
+                            "with Context.getLikedUri(identifier).");
                     }
-                    else if (actor.likedId.href != context.getLikedUri(handle).href) {
+                    else if (actor.likedId.href != context.getLikedUri(identifier).href) {
                         logger.warn("You configured a liked collection dispatcher, but the " +
                             "actor's liked property does not match the liked collection " +
-                            "URI.  Set the property with Context.getLikedUri(handle).");
+                            "URI.  Set the property with Context.getLikedUri(identifier).");
                     }
                 }
                 if (this.featuredCallbacks != null &&
@@ -409,12 +415,12 @@ export class FederationImpl {
                     if (actor?.featuredId == null) {
                         logger.warn("You configured a featured collection dispatcher, but the " +
                             "actor does not have a featured property.  Set the property " +
-                            "with Context.getFeaturedUri(handle).");
+                            "with Context.getFeaturedUri(identifier).");
                     }
-                    else if (actor.featuredId.href != context.getFeaturedUri(handle).href) {
+                    else if (actor.featuredId.href != context.getFeaturedUri(identifier).href) {
                         logger.warn("You configured a featured collection dispatcher, but the " +
                             "actor's featured property does not match the featured collection " +
-                            "URI.  Set the property with Context.getFeaturedUri(handle).");
+                            "URI.  Set the property with Context.getFeaturedUri(identifier).");
                     }
                 }
                 if (this.featuredTagsCallbacks != null &&
@@ -422,25 +428,26 @@ export class FederationImpl {
                     if (actor?.featuredTagsId == null) {
                         logger.warn("You configured a featured tags collection dispatcher, but the " +
                             "actor does not have a featuredTags property.  Set the property " +
-                            "with Context.getFeaturedTagsUri(handle).");
+                            "with Context.getFeaturedTagsUri(identifier).");
                     }
-                    else if (actor.featuredTagsId.href != context.getFeaturedTagsUri(handle).href) {
+                    else if (actor.featuredTagsId.href !=
+                        context.getFeaturedTagsUri(identifier).href) {
                         logger.warn("You configured a featured tags collection dispatcher, but the " +
                             "actor's featuredTags property does not match the featured tags " +
                             "collection URI.  Set the property with " +
-                            "Context.getFeaturedTagsUri(handle).");
+                            "Context.getFeaturedTagsUri(identifier).");
                     }
                 }
                 if (this.router.has("inbox")) {
                     if (actor.inboxId == null) {
                         logger.warn("You configured inbox listeners, but the actor does not " +
                             "have an inbox property.  Set the property with " +
-                            "Context.getInboxUri(handle).");
+                            "Context.getInboxUri(identifier).");
                     }
-                    else if (actor.inboxId.href != context.getInboxUri(handle).href) {
+                    else if (actor.inboxId.href != context.getInboxUri(identifier).href) {
                         logger.warn("You configured inbox listeners, but the actor's inbox " +
                             "property does not match the inbox URI.  Set the property " +
-                            "with Context.getInboxUri(handle).");
+                            "with Context.getInboxUri(identifier).");
                     }
                     if (actor.endpoints == null || actor.endpoints.sharedInbox == null) {
                         logger.warn("You configured inbox listeners, but the actor does not have " +
@@ -457,12 +464,12 @@ export class FederationImpl {
                     if (actor.publicKeyId == null) {
                         logger.warn("You configured a key pairs dispatcher, but the actor does " +
                             "not have a publicKey property.  Set the property with " +
-                            "Context.getActorKeyPairs(handle).");
+                            "Context.getActorKeyPairs(identifier).");
                     }
                     if (actor.assertionMethodId == null) {
                         logger.warn("You configured a key pairs dispatcher, but the actor does " +
                             "not have an assertionMethod property.  Set the property " +
-                            "with Context.getActorKeyPairs(handle).");
+                            "with Context.getActorKeyPairs(identifier).");
                     }
                 }
                 return actor;
@@ -521,8 +528,13 @@ export class FederationImpl {
         }
         else {
             const variables = this.router.add(path, "inbox");
-            if (variables.size !== 1 || !variables.has("handle")) {
-                throw new RouterError("Path for inbox dispatcher must have one variable: {handle}");
+            if (variables.size !== 1 ||
+                !(variables.has("identifier") || variables.has("handle"))) {
+                throw new RouterError("Path for inbox dispatcher must have one variable: {identifier}");
+            }
+            if (variables.has("handle")) {
+                getLogger(["fedify", "federation", "inbox"]).warn("The {handle} variable in the inbox dispatcher path is deprecated. " +
+                    "Use {identifier} instead.");
             }
             this.inboxPath = path;
         }
@@ -553,8 +565,13 @@ export class FederationImpl {
             throw new RouterError("Outbox dispatcher already set.");
         }
         const variables = this.router.add(path, "outbox");
-        if (variables.size !== 1 || !variables.has("handle")) {
-            throw new RouterError("Path for outbox dispatcher must have one variable: {handle}");
+        if (variables.size !== 1 ||
+            !(variables.has("identifier") || variables.has("handle"))) {
+            throw new RouterError("Path for outbox dispatcher must have one variable: {identifier}");
+        }
+        if (variables.has("handle")) {
+            getLogger(["fedify", "federation", "outbox"]).warn("The {handle} variable in the outbox dispatcher path is deprecated. " +
+                "Use {identifier} instead.");
         }
         const callbacks = { dispatcher };
         this.outboxCallbacks = callbacks;
@@ -583,8 +600,14 @@ export class FederationImpl {
             throw new RouterError("Following collection dispatcher already set.");
         }
         const variables = this.router.add(path, "following");
-        if (variables.size !== 1 || !variables.has("handle")) {
-            throw new RouterError("Path for following collection dispatcher must have one variable: {handle}");
+        if (variables.size !== 1 ||
+            !(variables.has("identifier") || variables.has("handle"))) {
+            throw new RouterError("Path for following collection dispatcher must have one variable: " +
+                "{identifier}");
+        }
+        if (variables.has("handle")) {
+            getLogger(["fedify", "federation", "collection"]).warn("The {handle} variable in the following collection dispatcher path " +
+                "is deprecated. Use {identifier} instead.");
         }
         const callbacks = { dispatcher };
         this.followingCallbacks = callbacks;
@@ -613,8 +636,14 @@ export class FederationImpl {
             throw new RouterError("Followers collection dispatcher already set.");
         }
         const variables = this.router.add(path, "followers");
-        if (variables.size !== 1 || !variables.has("handle")) {
-            throw new RouterError("Path for followers collection dispatcher must have one variable: {handle}");
+        if (variables.size !== 1 ||
+            !(variables.has("identifier") || variables.has("handle"))) {
+            throw new RouterError("Path for followers collection dispatcher must have one variable: " +
+                "{identifier}");
+        }
+        if (variables.has("handle")) {
+            getLogger(["fedify", "federation", "collection"]).warn("The {handle} variable in the followers collection dispatcher path " +
+                "is deprecated. Use {identifier} instead.");
         }
         const callbacks = { dispatcher };
         this.followersCallbacks = callbacks;
@@ -643,8 +672,14 @@ export class FederationImpl {
             throw new RouterError("Liked collection dispatcher already set.");
         }
         const variables = this.router.add(path, "liked");
-        if (variables.size !== 1 || !variables.has("handle")) {
-            throw new RouterError("Path for liked collection dispatcher must have one variable: {handle}");
+        if (variables.size !== 1 ||
+            !(variables.has("identifier") || variables.has("handle"))) {
+            throw new RouterError("Path for liked collection dispatcher must have one variable: " +
+                "{identifier}");
+        }
+        if (variables.has("handle")) {
+            getLogger(["fedify", "federation", "collection"]).warn("The {handle} variable in the liked collection dispatcher path " +
+                "is deprecated. Use {identifier} instead.");
         }
         const callbacks = { dispatcher };
         this.likedCallbacks = callbacks;
@@ -673,8 +708,14 @@ export class FederationImpl {
             throw new RouterError("Featured collection dispatcher already set.");
         }
         const variables = this.router.add(path, "featured");
-        if (variables.size !== 1 || !variables.has("handle")) {
-            throw new RouterError("Path for featured collection dispatcher must have one variable: {handle}");
+        if (variables.size !== 1 ||
+            !(variables.has("identifier") || variables.has("handle"))) {
+            throw new RouterError("Path for featured collection dispatcher must have one variable: " +
+                "{identifier}");
+        }
+        if (variables.has("handle")) {
+            getLogger(["fedify", "federation", "collection"]).warn("The {handle} variable in the featured collection dispatcher path " +
+                "is deprecated. Use {identifier} instead.");
         }
         const callbacks = { dispatcher };
         this.featuredCallbacks = callbacks;
@@ -703,9 +744,14 @@ export class FederationImpl {
             throw new RouterError("Featured tags collection dispatcher already set.");
         }
         const variables = this.router.add(path, "featuredTags");
-        if (variables.size !== 1 || !variables.has("handle")) {
+        if (variables.size !== 1 ||
+            !(variables.has("identifier") || variables.has("handle"))) {
             throw new RouterError("Path for featured tags collection dispatcher must have one " +
-                "variable: {handle}");
+                "variable: {identifier}");
+        }
+        if (variables.has("handle")) {
+            getLogger(["fedify", "federation", "collection"]).warn("The {handle} variable in the featured tags collection dispatcher " +
+                "path is deprecated. Use {identifier} instead.");
         }
         const callbacks = { dispatcher };
         this.featuredTagsCallbacks = callbacks;
@@ -740,10 +786,15 @@ export class FederationImpl {
         }
         else {
             const variables = this.router.add(inboxPath, "inbox");
-            if (variables.size !== 1 || !variables.has("handle")) {
-                throw new RouterError("Path for inbox must have one variable: {handle}");
+            if (variables.size !== 1 ||
+                !(variables.has("identifier") || variables.has("handle"))) {
+                throw new RouterError("Path for inbox must have one variable: {identifier}");
             }
             this.inboxPath = inboxPath;
+            if (variables.has("handle")) {
+                getLogger(["fedify", "federation", "inbox"]).warn("The {handle} variable in the inbox path is deprecated. " +
+                    "Use {identifier} instead.");
+            }
         }
         if (sharedInboxPath != null) {
             const siVars = this.router.add(sharedInboxPath, "sharedInbox");
@@ -950,10 +1001,12 @@ export class FederationImpl {
                 });
             case "actor":
                 context = this.#createContext(request, contextData, {
-                    invokedFromActorDispatcher: { handle: route.values.handle },
+                    invokedFromActorDispatcher: {
+                        identifier: route.values.identifier ?? route.values.handle,
+                    },
                 });
                 return await handleActor(request, {
-                    handle: route.values.handle,
+                    identifier: route.values.identifier ?? route.values.handle,
                     context,
                     actorDispatcher: this.actorCallbacks?.dispatcher,
                     authorizePredicate: this.actorCallbacks?.authorizePredicate,
@@ -981,7 +1034,7 @@ export class FederationImpl {
             case "outbox":
                 return await handleCollection(request, {
                     name: "outbox",
-                    handle: route.values.handle,
+                    identifier: route.values.identifier ?? route.values.handle,
                     uriGetter: context.getOutboxUri.bind(context),
                     context,
                     collectionCallbacks: this.outboxCallbacks,
@@ -993,7 +1046,7 @@ export class FederationImpl {
                 if (request.method !== "POST") {
                     return await handleCollection(request, {
                         name: "inbox",
-                        handle: route.values.handle,
+                        identifier: route.values.identifier ?? route.values.handle,
                         uriGetter: context.getInboxUri.bind(context),
                         context,
                         collectionCallbacks: this.inboxCallbacks,
@@ -1004,7 +1057,7 @@ export class FederationImpl {
                 }
                 context = this.#createContext(request, contextData, {
                     documentLoader: await context.getDocumentLoader({
-                        handle: route.values.handle,
+                        identifier: route.values.identifier ?? route.values.handle,
                     }),
                 });
             // falls through
@@ -1013,7 +1066,8 @@ export class FederationImpl {
                     const identity = await this.sharedInboxKeyDispatcher(context);
                     if (identity != null) {
                         context = this.#createContext(request, contextData, {
-                            documentLoader: "handle" in identity
+                            documentLoader: "identifier" in identity || "username" in identity ||
+                                "handle" in identity
                                 ? await context.getDocumentLoader(identity)
                                 : context.getDocumentLoader(identity),
                         });
@@ -1022,7 +1076,7 @@ export class FederationImpl {
                 if (!this.manuallyStartQueue)
                     this.#startQueue(contextData);
                 return await handleInbox(request, {
-                    handle: route.values.handle ?? null,
+                    identifier: route.values.identifier ?? route.values.handle ?? null,
                     context,
                     inboxContextFactory: context.toInboxContext.bind(context),
                     kv: this.kv,
@@ -1038,7 +1092,7 @@ export class FederationImpl {
             case "following":
                 return await handleCollection(request, {
                     name: "following",
-                    handle: route.values.handle,
+                    identifier: route.values.identifier ?? route.values.handle,
                     uriGetter: context.getFollowingUri.bind(context),
                     context,
                     collectionCallbacks: this.followingCallbacks,
@@ -1054,7 +1108,7 @@ export class FederationImpl {
                 }
                 return await handleCollection(request, {
                     name: "followers",
-                    handle: route.values.handle,
+                    identifier: route.values.identifier ?? route.values.handle,
                     uriGetter: context.getFollowersUri.bind(context),
                     context,
                     filter: baseUrl != null ? new URL(baseUrl) : undefined,
@@ -1070,7 +1124,7 @@ export class FederationImpl {
             case "liked":
                 return await handleCollection(request, {
                     name: "liked",
-                    handle: route.values.handle,
+                    identifier: route.values.identifier ?? route.values.handle,
                     uriGetter: context.getLikedUri.bind(context),
                     context,
                     collectionCallbacks: this.likedCallbacks,
@@ -1081,7 +1135,7 @@ export class FederationImpl {
             case "featured":
                 return await handleCollection(request, {
                     name: "featured",
-                    handle: route.values.handle,
+                    identifier: route.values.identifier ?? route.values.handle,
                     uriGetter: context.getFeaturedUri.bind(context),
                     context,
                     collectionCallbacks: this.featuredCallbacks,
@@ -1092,7 +1146,7 @@ export class FederationImpl {
             case "featuredTags":
                 return await handleCollection(request, {
                     name: "featured tags",
-                    handle: route.values.handle,
+                    identifier: route.values.identifier ?? route.values.handle,
                     uriGetter: context.getFeaturedTagsUri.bind(context),
                     context,
                     collectionCallbacks: this.featuredTagsCallbacks,
@@ -1149,8 +1203,8 @@ class ContextImpl {
         }
         return new URL(path, this.url);
     }
-    getActorUri(handle) {
-        const path = this.federation.router.build("actor", { handle });
+    getActorUri(identifier) {
+        const path = this.federation.router.build("actor", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No actor dispatcher registered.");
         }
@@ -1174,57 +1228,57 @@ class ContextImpl {
         }
         return new URL(path, this.url);
     }
-    getOutboxUri(handle) {
-        const path = this.federation.router.build("outbox", { handle });
+    getOutboxUri(identifier) {
+        const path = this.federation.router.build("outbox", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No outbox dispatcher registered.");
         }
         return new URL(path, this.url);
     }
-    getInboxUri(handle) {
-        if (handle == null) {
+    getInboxUri(identifier) {
+        if (identifier == null) {
             const path = this.federation.router.build("sharedInbox", {});
             if (path == null) {
                 throw new RouterError("No shared inbox path registered.");
             }
             return new URL(path, this.url);
         }
-        const path = this.federation.router.build("inbox", { handle });
+        const path = this.federation.router.build("inbox", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No inbox path registered.");
         }
         return new URL(path, this.url);
     }
-    getFollowingUri(handle) {
-        const path = this.federation.router.build("following", { handle });
+    getFollowingUri(identifier) {
+        const path = this.federation.router.build("following", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No following collection path registered.");
         }
         return new URL(path, this.url);
     }
-    getFollowersUri(handle) {
-        const path = this.federation.router.build("followers", { handle });
+    getFollowersUri(identifier) {
+        const path = this.federation.router.build("followers", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No followers collection path registered.");
         }
         return new URL(path, this.url);
     }
-    getLikedUri(handle) {
-        const path = this.federation.router.build("liked", { handle });
+    getLikedUri(identifier) {
+        const path = this.federation.router.build("liked", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No liked collection path registered.");
         }
         return new URL(path, this.url);
     }
-    getFeaturedUri(handle) {
-        const path = this.federation.router.build("featured", { handle });
+    getFeaturedUri(identifier) {
+        const path = this.federation.router.build("featured", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No featured collection path registered.");
         }
         return new URL(path, this.url);
     }
-    getFeaturedTagsUri(handle) {
-        const path = this.federation.router.build("featuredTags", { handle });
+    getFeaturedTagsUri(identifier) {
+        const path = this.federation.router.build("featuredTags", { identifier, handle: identifier });
         if (path == null) {
             throw new RouterError("No featured tags collection path registered.");
         }
@@ -1236,10 +1290,33 @@ class ContextImpl {
         if (uri.origin !== this.url.origin)
             return null;
         const route = this.federation.router.route(uri.pathname);
+        const logger = getLogger(["fedify", "federation"]);
         if (route == null)
             return null;
-        else if (route.name === "actor") {
-            return { type: "actor", handle: route.values.handle };
+        else if (route.name === "sharedInbox") {
+            return {
+                type: "inbox",
+                identifier: undefined,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return undefined;
+                },
+            };
+        }
+        const identifier = "identifier" in route.values
+            ? route.values.identifier
+            : route.values.handle;
+        if (route.name === "actor") {
+            return {
+                type: "actor",
+                identifier,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return identifier;
+                },
+            };
         }
         else if (route.name.startsWith("object:")) {
             const typeId = route.name.replace(/^object:/, "");
@@ -1251,50 +1328,104 @@ class ContextImpl {
             };
         }
         else if (route.name === "inbox") {
-            return { type: "inbox", handle: route.values.handle };
-        }
-        else if (route.name === "sharedInbox") {
-            return { type: "inbox" };
+            return {
+                type: "inbox",
+                identifier,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return identifier;
+                },
+            };
         }
         else if (route.name === "outbox") {
-            return { type: "outbox", handle: route.values.handle };
+            return {
+                type: "outbox",
+                identifier,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return identifier;
+                },
+            };
         }
         else if (route.name === "following") {
-            return { type: "following", handle: route.values.handle };
+            return {
+                type: "following",
+                identifier,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return identifier;
+                },
+            };
         }
         else if (route.name === "followers") {
-            return { type: "followers", handle: route.values.handle };
+            return {
+                type: "followers",
+                identifier,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return identifier;
+                },
+            };
         }
         else if (route.name === "liked") {
-            return { type: "liked", handle: route.values.handle };
+            return {
+                type: "liked",
+                identifier,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return identifier;
+                },
+            };
         }
         else if (route.name === "featured") {
-            return { type: "featured", handle: route.values.handle };
+            return {
+                type: "featured",
+                identifier,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return identifier;
+                },
+            };
         }
         else if (route.name === "featuredTags") {
-            return { type: "featuredTags", handle: route.values.handle };
+            return {
+                type: "featuredTags",
+                identifier,
+                get handle() {
+                    logger.warn("The ParseUriResult.handle property is deprecated; " +
+                        "use ParseUriResult.identifier instead.");
+                    return identifier;
+                },
+            };
         }
         return null;
     }
-    async getActorKeyPairs(handle) {
+    async getActorKeyPairs(identifier) {
         const logger = getLogger(["fedify", "federation", "actor"]);
         if (this.invokedFromActorKeyPairsDispatcher != null) {
-            logger.warn("Context.getActorKeyPairs({getActorKeyPairsHandle}) method is " +
+            logger.warn("Context.getActorKeyPairs({getActorKeyPairsIdentifier}) method is " +
                 "invoked from the actor key pairs dispatcher " +
-                "({actorKeyPairsDispatcherHandle}); this may cause an infinite loop.", {
-                getActorKeyPairsHandle: handle,
-                actorKeyPairsDispatcherHandle: this.invokedFromActorKeyPairsDispatcher.handle,
+                "({actorKeyPairsDispatcherIdentifier}); this may cause " +
+                "an infinite loop.", {
+                getActorKeyPairsIdentifier: identifier,
+                actorKeyPairsDispatcherIdentifier: this.invokedFromActorKeyPairsDispatcher.identifier,
             });
         }
         let keyPairs;
         try {
-            keyPairs = await this.getKeyPairsFromHandle(handle);
+            keyPairs = await this.getKeyPairsFromIdentifier(identifier);
         }
         catch (_) {
             logger.warn("No actor key pairs dispatcher registered.");
             return [];
         }
-        const owner = this.getActorUri(handle);
+        const owner = this.getActorUri(identifier);
         const result = [];
         for (const keyPair of keyPairs) {
             const newPair = {
@@ -1314,12 +1445,12 @@ class ContextImpl {
         }
         return result;
     }
-    async getKeyPairsFromHandle(handle) {
+    async getKeyPairsFromIdentifier(identifier) {
         const logger = getLogger(["fedify", "federation", "actor"]);
         if (this.federation.actorCallbacks?.keyPairsDispatcher == null) {
             throw new Error("No actor key pairs dispatcher registered.");
         }
-        const path = this.federation.router.build("actor", { handle });
+        const path = this.federation.router.build("actor", { identifier, handle: identifier });
         if (path == null) {
             logger.warn("No actor dispatcher registered.");
             return [];
@@ -1327,10 +1458,10 @@ class ContextImpl {
         const actorUri = new URL(path, this.url);
         const keyPairs = await this.federation.actorCallbacks?.keyPairsDispatcher(new ContextImpl({
             ...this,
-            invokedFromActorKeyPairsDispatcher: { handle },
-        }), handle);
+            invokedFromActorKeyPairsDispatcher: { identifier },
+        }), identifier);
         if (keyPairs.length < 1) {
-            logger.warn("No key pairs found for actor {handle}.", { handle });
+            logger.warn("No key pairs found for actor {identifier}.", { identifier });
         }
         let i = 0;
         const result = [];
@@ -1345,8 +1476,8 @@ class ContextImpl {
         }
         return result;
     }
-    async getRsaKeyPairFromHandle(handle) {
-        const keyPairs = await this.getKeyPairsFromHandle(handle);
+    async getRsaKeyPairFromIdentifier(identifier) {
+        const keyPairs = await this.getKeyPairsFromIdentifier(identifier);
         for (const keyPair of keyPairs) {
             const { privateKey } = keyPair;
             if (privateKey.algorithm.name === "RSASSA-PKCS1-v1_5" &&
@@ -1356,15 +1487,44 @@ class ContextImpl {
                 return keyPair;
             }
         }
-        getLogger(["fedify", "federation", "actor"]).warn("No RSA-PKCS#1-v1.5 SHA-256 key found for actor {handle}.", { handle });
+        getLogger(["fedify", "federation", "actor"]).warn("No RSA-PKCS#1-v1.5 SHA-256 key found for actor {identifier}.", { identifier });
         return null;
     }
     getDocumentLoader(identity) {
-        if ("handle" in identity) {
-            const keyPair = this.getRsaKeyPairFromHandle(identity.handle);
-            return keyPair.then((pair) => pair == null
-                ? this.documentLoader
-                : this.federation.authenticatedDocumentLoaderFactory(pair));
+        if ("identifier" in identity || "username" in identity || "handle" in identity) {
+            let identifierPromise;
+            if ("username" in identity || "handle" in identity) {
+                let username;
+                if ("username" in identity) {
+                    username = identity.username;
+                }
+                else {
+                    username = identity.handle;
+                    getLogger(["fedify", "runtime", "docloader"]).warn('The "handle" property is deprecated; use "identifier" or ' +
+                        '"username" instead.', { identity });
+                }
+                const mapper = this.federation.actorCallbacks?.handleMapper;
+                if (mapper == null) {
+                    identifierPromise = Promise.resolve(username);
+                }
+                else {
+                    const identifier = mapper(this, username);
+                    identifierPromise = identifier instanceof Promise
+                        ? identifier
+                        : Promise.resolve(identifier);
+                }
+            }
+            else {
+                identifierPromise = Promise.resolve(identity.identifier);
+            }
+            return identifierPromise.then((identifier) => {
+                if (identifier == null)
+                    return this.documentLoader;
+                const keyPair = this.getRsaKeyPairFromIdentifier(identifier);
+                return keyPair.then((pair) => pair == null
+                    ? this.documentLoader
+                    : this.federation.authenticatedDocumentLoaderFactory(pair));
+            });
         }
         return this.federation.authenticatedDocumentLoaderFactory(identity);
     }
@@ -1376,10 +1536,35 @@ class ContextImpl {
     }
     async sendActivity(sender, recipients, activity, options = {}) {
         let keys;
-        if ("handle" in sender) {
-            keys = await this.getKeyPairsFromHandle(sender.handle);
+        let identifier = null;
+        if ("identifier" in sender || "username" in sender || "handle" in sender) {
+            if ("identifier" in sender) {
+                identifier = sender.identifier;
+            }
+            else {
+                let username;
+                if ("username" in sender) {
+                    username = sender.username;
+                }
+                else {
+                    username = sender.handle;
+                    getLogger(["fedify", "federation", "outbox"]).warn('The "handle" property for the sender parameter is deprecated; ' +
+                        'use "identifier" or "username" instead.', { sender });
+                }
+                if (this.federation.actorCallbacks?.handleMapper == null) {
+                    identifier = username;
+                }
+                else {
+                    const mapped = await this.federation.actorCallbacks.handleMapper(this, username);
+                    if (mapped == null) {
+                        throw new Error(`No actor found for the given username ${JSON.stringify(username)}.`);
+                    }
+                    identifier = mapped;
+                }
+            }
+            keys = await this.getKeyPairsFromIdentifier(identifier);
             if (keys.length < 1) {
-                throw new Error(`No key pair found for actor ${JSON.stringify(sender.handle)}.`);
+                throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
             }
         }
         else if (Array.isArray(sender)) {
@@ -1400,14 +1585,15 @@ class ContextImpl {
             expandedRecipients = recipients;
         }
         else if (recipients === "followers") {
-            if (!("handle" in sender)) {
-                throw new Error("If recipients is 'followers', sender must be an actor handle.");
+            if (identifier == null) {
+                throw new Error('If recipients is "followers", ' +
+                    "sender must be an actor identifier or username.");
             }
             expandedRecipients = [];
-            for await (const recipient of this.getFollowers(sender.handle)) {
+            for await (const recipient of this.getFollowers(identifier)) {
                 expandedRecipients.push(recipient);
             }
-            const collectionId = this.federation.router.build("followers", sender);
+            const collectionId = this.federation.router.build("followers", { identifier, handle: identifier });
             opts.collectionSync = collectionId == null
                 ? undefined
                 : new URL(collectionId, this.url).href;
@@ -1417,11 +1603,11 @@ class ContextImpl {
         }
         return await this.federation.sendActivity(keys, expandedRecipients, activity, opts);
     }
-    async *getFollowers(handle) {
+    async *getFollowers(identifier) {
         if (this.federation.followersCallbacks == null) {
             throw new Error("No followers collection dispatcher registered.");
         }
-        const result = await this.federation.followersCallbacks.dispatcher(this, handle, null);
+        const result = await this.federation.followersCallbacks.dispatcher(this, identifier, null);
         if (result != null) {
             for (const recipient of result.items)
                 yield recipient;
@@ -1430,9 +1616,9 @@ class ContextImpl {
         if (this.federation.followersCallbacks.firstCursor == null) {
             throw new Error("No first cursor dispatcher registered for followers collection.");
         }
-        let cursor = await this.federation.followersCallbacks.firstCursor(this, handle);
+        let cursor = await this.federation.followersCallbacks.firstCursor(this, identifier);
         while (cursor != null) {
-            const result = await this.federation.followersCallbacks.dispatcher(this, handle, cursor);
+            const result = await this.federation.followersCallbacks.dispatcher(this, identifier, cursor);
             if (result == null)
                 break;
             for (const recipient of result.items)
@@ -1453,23 +1639,23 @@ class RequestContextImpl extends ContextImpl {
         this.request = options.request;
         this.url = options.url;
     }
-    async getActor(handle) {
+    async getActor(identifier) {
         if (this.federation.actorCallbacks == null ||
             this.federation.actorCallbacks.dispatcher == null) {
             throw new Error("No actor dispatcher registered.");
         }
         if (this.#invokedFromActorDispatcher != null) {
-            getLogger(["fedify", "federation", "actor"]).warn("RequestContext.getActor({getActorHandle}) is invoked from " +
-                "the actor dispatcher ({actorDispatcherHandle}); " +
+            getLogger(["fedify", "federation", "actor"]).warn("RequestContext.getActor({getActorIdentifier}) is invoked from " +
+                "the actor dispatcher ({actorDispatcherIdentifier}); " +
                 "this may cause an infinite loop.", {
-                getActorHandle: handle,
-                actorDispatcherHandle: this.#invokedFromActorDispatcher.handle,
+                getActorIdentifier: identifier,
+                actorDispatcherIdentifier: this.#invokedFromActorDispatcher.identifier,
             });
         }
         return await this.federation.actorCallbacks.dispatcher(new RequestContextImpl({
             ...this,
-            invokedFromActorDispatcher: { handle },
-        }), handle);
+            invokedFromActorDispatcher: { identifier },
+        }), identifier);
     }
     async getObject(
     // deno-lint-ignore no-explicit-any
@@ -1527,10 +1713,36 @@ export class InboxContextImpl extends ContextImpl {
     async forwardActivity(forwarder, recipients, options) {
         const logger = getLogger(["fedify", "federation", "inbox"]);
         let keys;
-        if ("handle" in forwarder) {
-            keys = await this.getKeyPairsFromHandle(forwarder.handle);
+        let identifier = null;
+        if ("identifier" in forwarder || "username" in forwarder ||
+            "handle" in forwarder) {
+            if ("identifier" in forwarder) {
+                identifier = forwarder.identifier;
+            }
+            else {
+                let username;
+                if ("username" in forwarder) {
+                    username = forwarder.username;
+                }
+                else {
+                    username = forwarder.handle;
+                    logger.warn('The "handle" property for the forwarder parameter is deprecated; ' +
+                        'use "identifier" or "username" instead.', { forwarder });
+                }
+                if (this.federation.actorCallbacks?.handleMapper == null) {
+                    identifier = username;
+                }
+                else {
+                    const mapped = await this.federation.actorCallbacks.handleMapper(this, username);
+                    if (mapped == null) {
+                        throw new Error(`No actor found for the given username ${JSON.stringify(username)}.`);
+                    }
+                    identifier = mapped;
+                }
+            }
+            keys = await this.getKeyPairsFromIdentifier(identifier);
             if (keys.length < 1) {
-                throw new Error(`No key pair found for actor ${JSON.stringify(forwarder.handle)}.`);
+                throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
             }
         }
         else if (Array.isArray(forwarder)) {
@@ -1571,11 +1783,12 @@ export class InboxContextImpl extends ContextImpl {
                         : undefined;
         }
         if (recipients === "followers") {
-            if (!("handle" in forwarder)) {
-                throw new Error("If recipients is 'followers', forwarder must be an actor handle.");
+            if (identifier == null) {
+                throw new Error('If recipients is "followers", ' +
+                    "forwarder must be an actor identifier or username.");
             }
             const followers = [];
-            for await (const recipient of this.getFollowers(forwarder.handle)) {
+            for await (const recipient of this.getFollowers(identifier)) {
                 followers.push(recipient);
             }
             recipients = followers;