@fedify/fedify 1.4.0-dev.633 → 1.4.0-dev.634

package/CHANGES.md

@@ -21,6 +21,12 @@ To be released.
         to `AuthenticatedDocumentLoaderFactory` type.
      -  `GetAuthenticatedDocumentLoaderOptions` interface became to extend
         `DocumentLoaderFactoryOptions` interface.
+     -  Added a type parameter `TContextData` to `CreateFederationOptions`
+        interface.
+     -  Fedify now assigns a random-generated *http:*/*https:* URI to
+        activities if these do not have explicit `id` properties.  This behavior
+        can be disabled by excluding `autoIdAssigner()` from
+        the `CreateFederationOptions.activityTransformers` option.
 
  -  Introduced `ActivityTransformer`s for adjusting outgoing activities
     before sending them so that some ActivityPub implementations with quirks

package/esm/compat/transformers.js

@@ -6,19 +6,23 @@ const logger = getLogger(["fedify", "compat", "transformers"]);
  * does not already have one.  This is useful for ensuring that activities
  * have an ID before they are sent to other servers.
  *
- * The generated ID is a URN UUID like:
+ * The generated ID is an origin URI with a fragment which contains an activity
+ * type name with a random UUID:
  *
  * ```
- * urn:uuid:12345678-1234-5678-1234-567812345678
+ * https://example.com/#Follow/12345678-1234-5678-1234-567812345678
  * ```
+ *
+ * @typeParam TContextData The type of the context data.
  * @param activity The activity to assign an ID to.
+ * @param context The context of the activity.
  * @return The activity with an ID assigned.
  * @since 1.4.0
  */
-export function autoIdAssigner(activity) {
+export function autoIdAssigner(activity, context) {
     if (activity.id != null)
         return activity;
-    const id = new URL(`urn:uuid:${dntShim.crypto.randomUUID()}`);
+    const id = new URL(`/#${activity.constructor.name}/${dntShim.crypto.randomUUID()}`, context.origin);
     logger.warn("As the activity to send does not have an id, a new id {id} has " +
         "been generated for it.  However, it is recommended to explicitly " +
         "set the id for the activity.", { id: id.href });
@@ -63,11 +67,13 @@ export function autoIdAssigner(activity) {
  *
  * As some ActivityPub implementations like Threads fail to deal with inlined
  * actor objects, this transformer can be used to work around this issue.
+ * @typeParam TContextData The type of the context data.
  * @param activity The activity to dehydrate the actor property of.
+ * @param context The context of the activity.
  * @returns The dehydrated activity.
  * @since 1.4.0
  */
-export function actorDehydrator(activity) {
+export function actorDehydrator(activity, _context) {
     if (activity.actorIds.length < 1)
         return activity;
     return activity.clone({
@@ -75,11 +81,15 @@ export function actorDehydrator(activity) {
     });
 }
 /**
- * The default activity transformers that are applied to all outgoing
+ * Gets the default activity transformers that are applied to all outgoing
  * activities.
+ * @typeParam TContextData The type of the context data.
+ * @returns The default activity transformers.
  * @since 1.4.0
  */
-export const defaultActivityTransformers = [
-    autoIdAssigner,
-    actorDehydrator,
-];
+export function getDefaultActivityTransformers() {
+    return [
+        autoIdAssigner,
+        actorDehydrator,
+    ];
+}

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@fedify/fedify",
-    "version": "1.4.0-dev.633+1856bfff",
+    "version": "1.4.0-dev.634+89074a8d",
     "license": "MIT",
     "exports": {
         ".": "./mod.ts",

package/esm/federation/middleware.js

@@ -3,7 +3,7 @@ import { verifyObject } from "../mod.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { context, propagation, SpanKind, SpanStatusCode, trace, } from "@opentelemetry/api";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_HEADER, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_FULL, } from "@opentelemetry/semantic-conventions";
-import { defaultActivityTransformers } from "../compat/transformers.js";
+import { getDefaultActivityTransformers } from "../compat/transformers.js";
 import metadata from "../deno.js";
 import { getNodeInfo } from "../nodeinfo/client.js";
 import { handleNodeInfo, handleNodeInfoJrd } from "../nodeinfo/handler.js";
@@ -169,7 +169,7 @@ export class FederationImpl {
         this.inboxRetryPolicy = options.inboxRetryPolicy ??
             createExponentialBackoffPolicy();
         this.activityTransformers = options.activityTransformers ??
-            defaultActivityTransformers;
+            getDefaultActivityTransformers();
         this.tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
     }
     #getTracer() {
@@ -1089,7 +1089,7 @@ export class FederationImpl {
     }
     async sendActivity(keys, recipients, activity, options, span) {
         const logger = getLogger(["fedify", "federation", "outbox"]);
-        const { preferSharedInbox, immediate, excludeBaseUris, collectionSync, contextData, origin, } = options;
+        const { preferSharedInbox, immediate, excludeBaseUris, collectionSync, context: ctx, } = options;
         if (keys.length < 1) {
             throw new TypeError("The sender's keys must not be empty.");
         }
@@ -1097,7 +1097,7 @@ export class FederationImpl {
             validateCryptoKey(privateKey, "private");
         }
         for (const activityTransformer of this.activityTransformers) {
-            activity = activityTransformer(activity);
+            activity = activityTransformer(activity, ctx);
         }
         span?.setAttribute("activitypub.activity.id", activity?.id?.href ?? "");
         if (activity.actorId == null) {
@@ -1123,7 +1123,7 @@ export class FederationImpl {
         else if (keys.length < 1) {
             throw new TypeError("The keys must not be empty.");
         }
-        const contextLoader = this.contextLoaderFactory(this.#getLoaderOptions(origin));
+        const contextLoader = this.contextLoaderFactory(this.#getLoaderOptions(ctx.origin));
         const activityId = activity.id.href;
         let proofCreated = false;
         let rsaKey = null;
@@ -1207,7 +1207,7 @@ export class FederationImpl {
             keyJwkPairs.push({ keyId: keyId.href, privateKey: privateKeyJwk });
         }
         if (!this.manuallyStartQueue)
-            this.#startQueue(contextData);
+            this.#startQueue(ctx.data);
         const carrier = {};
         propagation.inject(context.active(), carrier);
         const promises = [];
@@ -1215,7 +1215,7 @@ export class FederationImpl {
             const message = {
                 type: "outbox",
                 id: dntShim.crypto.randomUUID(),
-                baseUrl: origin,
+                baseUrl: ctx.origin,
                 keys: keyJwkPairs,
                 activity: jsonLd,
                 activityId: activity.id?.href,
@@ -1976,8 +1976,7 @@ export class ContextImpl {
             keys = [sender];
         }
         const opts = {
-            contextData: this.data,
-            origin: this.origin,
+            context: this,
             ...options,
         };
         let expandedRecipients;