@fedify/fedify 1.5.0-dev.731 → 1.5.0-dev.738

package/esm/federation/middleware.js

@@ -1289,7 +1289,7 @@ export class FederationImpl {
             this._startQueueInternal(ctx.data);
         const carrier = {};
         propagation.inject(context.active(), carrier);
-        const promises = [];
+        const messages = [];
         for (const inbox in inboxes) {
             const message = {
                 type: "outbox",
@@ -1308,18 +1308,31 @@ export class FederationImpl {
                 },
                 traceContext: carrier,
             };
-            promises.push(this.outboxQueue.enqueue(message));
+            messages.push(message);
+        }
+        const { outboxQueue } = this;
+        if (outboxQueue.enqueueMany == null) {
+            const promises = messages.map((m) => outboxQueue.enqueue(m));
+            const results = await Promise.allSettled(promises);
+            const errors = results
+                .filter((r) => r.status === "rejected")
+                .map((r) => r.reason);
+            if (errors.length > 0) {
+                logger.error("Failed to enqueue activity {activityId} to send later: {errors}", { activityId: activity.id.href, errors });
+                if (errors.length > 1) {
+                    throw new AggregateError(errors, `Failed to enqueue activity ${activityId} to send later.`);
+                }
+                throw errors[0];
+            }
         }
-        const results = await Promise.allSettled(promises);
-        const errors = results
-            .filter((r) => r.status === "rejected")
-            .map((r) => r.reason);
-        if (errors.length > 0) {
-            logger.error("Failed to enqueue activity {activityId} to send later: {errors}", { activityId: activity.id.href, errors });
-            if (errors.length > 1) {
-                throw new AggregateError(errors, `Failed to enqueue activity ${activityId} to send later.`);
+        else {
+            try {
+                await outboxQueue.enqueueMany(messages);
+            }
+            catch (error) {
+                logger.error("Failed to enqueue activity {activityId} to send later: {error}", { activityId: activity.id.href, error });
+                throw error;
             }
-            throw errors[0];
         }
     }
     fetch(request, options) {
@@ -1531,7 +1544,13 @@ export class FederationImpl {
                 return await handleCollection(request, {
                     name: "followers",
                     identifier: route.values.identifier ?? route.values.handle,
-                    uriGetter: context.getFollowersUri.bind(context),
+                    uriGetter: baseUrl == null
+                        ? context.getFollowersUri.bind(context)
+                        : (identifier) => {
+                            const uri = context.getFollowersUri(identifier);
+                            uri.searchParams.set("base-url", baseUrl);
+                            return uri;
+                        },
                     context,
                     filter: baseUrl != null ? new URL(baseUrl) : undefined,
                     filterPredicate: baseUrl != null
@@ -2161,6 +2180,12 @@ export class ContextImpl {
             throw new Error("No first cursor dispatcher registered for followers collection.");
         }
         let cursor = await this.federation.followersCallbacks.firstCursor(this, identifier);
+        if (cursor != null) {
+            getLogger(["fedify", "federation", "outbox"]).warn("Since the followers collection dispatcher returned null for no " +
+                "cursor (i.e., one-shot dispatcher), the pagination is used to fetch " +
+                '"followers".  However, it is recommended to implement the one-shot ' +
+                "dispatcher for better performance.", { identifier });
+        }
         while (cursor != null) {
             const result = await this.federation.followersCallbacks.dispatcher(this, identifier, cursor);
             if (result == null)
@@ -2516,7 +2541,7 @@ export class InboxContextImpl extends ContextImpl {
         }
         const carrier = {};
         propagation.inject(context.active(), carrier);
-        const promises = [];
+        const messages = [];
         for (const inbox in inboxes) {
             const message = {
                 type: "outbox",
@@ -2533,18 +2558,31 @@ export class InboxContextImpl extends ContextImpl {
                 headers: {},
                 traceContext: carrier,
             };
-            promises.push(this.federation.outboxQueue.enqueue(message));
-        }
-        const results = await Promise.allSettled(promises);
-        const errors = results
-            .filter((r) => r.status === "rejected")
-            .map((r) => r.reason);
-        if (errors.length > 0) {
-            logger.error("Failed to enqueue activity {activityId} to forward later:\n{errors}", { activityId: this.activityId, errors });
-            if (errors.length > 1) {
-                throw new AggregateError(errors, `Failed to enqueue activity ${this.activityId} to forward later.`);
-            }
-            throw errors[0];
+            messages.push(message);
+        }
+        const { outboxQueue } = this.federation;
+        if (outboxQueue.enqueueMany == null) {
+            const promises = messages.map((m) => outboxQueue.enqueue(m));
+            const results = await Promise.allSettled(promises);
+            const errors = results
+                .filter((r) => r.status === "rejected")
+                .map((r) => r.reason);
+            if (errors.length > 0) {
+                logger.error("Failed to enqueue activity {activityId} to forward later:\n{errors}", { activityId: this.activityId, errors });
+                if (errors.length > 1) {
+                    throw new AggregateError(errors, `Failed to enqueue activity ${this.activityId} to forward later.`);
+                }
+                throw errors[0];
+            }
+        }
+        else {
+            try {
+                await outboxQueue.enqueueMany(messages);
+            }
+            catch (error) {
+                logger.error("Failed to enqueue activity {activityId} to forward later:\n{error}", { activityId: this.activityId, error });
+                throw error;
+            }
         }
     }
 }

package/esm/federation/mq.js

@@ -39,6 +39,22 @@ export class InProcessMessageQueue {
         }
         return Promise.resolve();
     }
+    enqueueMany(messages, options) {
+        if (messages.length === 0)
+            return Promise.resolve();
+        const delay = options?.delay == null
+            ? 0
+            : Math.max(options.delay.total("millisecond"), 0);
+        if (delay > 0) {
+            setTimeout(() => this.enqueueMany(messages, { ...options, delay: undefined }), delay);
+            return Promise.resolve();
+        }
+        this.#messages.push(...messages);
+        for (const monitorId in this.#monitors) {
+            this.#monitors[monitorId]();
+        }
+        return Promise.resolve();
+    }
     async listen(handler, options = {}) {
         const signal = options.signal;
         while (signal == null || !signal.aborted) {
@@ -107,6 +123,21 @@ export class ParallelMessageQueue {
     enqueue(message, options) {
         return this.queue.enqueue(message, options);
     }
+    async enqueueMany(messages, options) {
+        if (this.queue.enqueueMany == null) {
+            const results = await Promise.allSettled(messages.map((message) => this.queue.enqueue(message, options)));
+            const errors = results
+                .filter((r) => r.status === "rejected")
+                .map((r) => r.reason);
+            if (errors.length > 1) {
+                throw new AggregateError(errors, "Failed to enqueue messages.");
+            }
+            else if (errors.length === 1)
+                throw errors[0];
+            return;
+        }
+        await this.queue.enqueueMany(messages, options);
+    }
     listen(handler, options = {}) {
         const workers = new Map();
         return this.queue.listen(async (message) => {

package/esm/runtime/key.js

@@ -1,8 +1,8 @@
 import * as dntShim from "../_dnt.shims.js";
 import { concat } from "../deps/jsr.io/@std/bytes/1.0.5/concat.js";
-import { decodeBase64, encodeBase64 } from "../deps/jsr.io/@std/encoding/1.0.7/base64.js";
-import { decodeBase64Url } from "../deps/jsr.io/@std/encoding/1.0.7/base64url.js";
-import { decodeHex } from "../deps/jsr.io/@std/encoding/1.0.7/hex.js";
+import { decodeBase64, encodeBase64 } from "../deps/jsr.io/@std/encoding/1.0.8/base64.js";
+import { decodeBase64Url } from "../deps/jsr.io/@std/encoding/1.0.8/base64url.js";
+import { decodeHex } from "../deps/jsr.io/@std/encoding/1.0.8/hex.js";
 import { Integer, Sequence } from "asn1js";
 import { decode, encode } from "./multibase/index.js";
 import { addPrefix, getCodeFromData, rmPrefix } from "multicodec";

package/esm/sig/http.js

@@ -3,8 +3,8 @@ import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace, } from "@opentelemetry/api";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL, } from "@opentelemetry/semantic-conventions";
 import { equals } from "../deps/jsr.io/@std/bytes/1.0.5/mod.js";
-import { decodeBase64, encodeBase64 } from "../deps/jsr.io/@std/encoding/1.0.7/base64.js";
-import { encodeHex } from "../deps/jsr.io/@std/encoding/1.0.7/hex.js";
+import { decodeBase64, encodeBase64 } from "../deps/jsr.io/@std/encoding/1.0.8/base64.js";
+import { encodeHex } from "../deps/jsr.io/@std/encoding/1.0.8/hex.js";
 import metadata from "../deno.js";
 import { CryptographicKey } from "../vocab/vocab.js";
 import { fetchKey, validateCryptoKey } from "./key.js";

package/esm/sig/ld.js

@@ -1,8 +1,8 @@
 import * as dntShim from "../_dnt.shims.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
-import { decodeBase64, encodeBase64 } from "../deps/jsr.io/@std/encoding/1.0.7/base64.js";
-import { encodeHex } from "../deps/jsr.io/@std/encoding/1.0.7/hex.js";
+import { decodeBase64, encodeBase64 } from "../deps/jsr.io/@std/encoding/1.0.8/base64.js";
+import { encodeHex } from "../deps/jsr.io/@std/encoding/1.0.8/hex.js";
 // @ts-ignore TS7016
 import jsonld from "jsonld";
 import metadata from "../deno.js";

package/esm/sig/proof.js

@@ -1,7 +1,7 @@
 import * as dntShim from "../_dnt.shims.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
-import { encodeHex } from "../deps/jsr.io/@std/encoding/1.0.7/hex.js";
+import { encodeHex } from "../deps/jsr.io/@std/encoding/1.0.8/hex.js";
 // @ts-ignore: json-canon is not typed
 import serialize from "json-canon";
 import metadata from "../deno.js";

package/esm/vocab/lookup.js

@@ -1,7 +1,7 @@
 import * as dntShim from "../_dnt.shims.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
-import { delay } from "../deps/jsr.io/@std/async/1.0.11/delay.js";
+import { delay } from "../deps/jsr.io/@std/async/1.0.12/delay.js";
 import metadata from "../deno.js";
 import { getDocumentLoader, } from "../runtime/docloader.js";
 import { lookupWebFinger } from "../webfinger/lookup.js";