Skip to content

Node.js based forum software built for the modern web

fix(activitypub): repair send pool drain loop and worker sizing

Julian Lamce0765fe2602
diff --git a/src/activitypub/jobs.js b/src/activitypub/jobs.js
index 6655ae7746..70af53c003 100644
--- a/src/activitypub/jobs.js
+++ b/src/activitypub/jobs.js
@@ -69,6 +69,12 @@ Jobs.start = async () => {
});
},
});
+
+ // Start draining the send retry queue so tasks left over from a previous
+ // run are retried without waiting for the next outgoing send
+ if (meta.config.activitypubEnabled) {
+ activitypub.SendPool.drainLoop();
+ }
};
async function backfill() {
diff --git a/src/activitypub/send.js b/src/activitypub/send.js
index e1316a3f2e..364f58f20f 100644
--- a/src/activitypub/send.js
+++ b/src/activitypub/send.js
@@ -151,6 +151,8 @@ SendPool.handleResult = function (message) {
} else {
// Failure — re-queue with backoff
winston.warn(`[activitypub/send] Task ${id} failed: ${error}`);
+ // No longer in-flight — allow the re-queued task to be picked up again
+ SendPool.inFlight.delete(task.queueId);
SendPool.requeueTask(task);
}
};
@@ -210,6 +212,7 @@ SendPool.dispatch = function (taskId, task) {
// Task has been in-flight for >30s — re-queue and kill worker
SendPool.clearTaskTimer(taskId);
SendPool.pending.delete(taskId);
+ SendPool.inFlight.delete(task.queueId);
SendPool.requeueTask(task);
worker.kill('SIGKILL');
}, 30000);
@@ -274,10 +277,16 @@ SendPool.drainLoop = async function () {
const taskDataList = await Promise.all(
dueTasks.map(queueId => db.getObject(`ap:retry:queue:${queueId}`)),
);
- const validTaskData = dueTasks
- .filter(queueId => !SendPool.inFlight.has(queueId))
- .map((queueId, i) => (taskDataList[i] ? { queueId, taskData: taskDataList[i] } : null))
- .filter(Boolean);
+ // Pair each queueId with its own task data (taskDataList is aligned
+ // with the unfiltered dueTasks array) and skip in-flight or missing tasks
+ const validTaskData = [];
+ for (let i = 0; i < dueTasks.length; i++) {
+ const queueId = dueTasks[i];
+ const taskData = taskDataList[i];
+ if (taskData && !SendPool.inFlight.has(queueId)) {
+ validTaskData.push({ queueId, taskData });
+ }
+ }
// Fetch all key data in parallel
const keyPromises = validTaskData.map(({ taskData }) => (
diff --git a/test/activitypub/sendPool.js b/test/activitypub/sendPool.js
index a02c514fa6..209721b69c 100644
--- a/test/activitypub/sendPool.js
+++ b/test/activitypub/sendPool.js
@@ -3,6 +3,7 @@
const assert = require('assert');
const os = require('os');
+const db = require('../mocks/databasemock');
const activitypub = require('../../src/activitypub');
const SendPool = activitypub.SendPool;