Skip to content

Node.js based forum software built for the modern web

fix(activitypub): move fallback warning from worker to orchestrator

Julian Lamef860a339b87
diff --git a/src/activitypub/send.js b/src/activitypub/send.js
index 5b4574e93f..546205cdae 100644
--- a/src/activitypub/send.js
+++ b/src/activitypub/send.js
@@ -35,7 +35,7 @@ SendPool.init = function (activityPub) {
SendPool.handleResult = async function (queueId, result) {
if (result.success) {
- // Success — fire analytics and remove from Redis
+ // Success, fire analytics and remove from Redis
try {
await SendPool._activityPub.analytics.send({
type: result.payloadType,
@@ -129,7 +129,7 @@ SendPool.drainLoop = async function () {
);
if (dueTasks.length === 0) {
- // No tasks due — switch to idle mode
+ // No tasks due - switch to idle mode
SendPool._draining = false;
setTimeout(() => {
if (SendPool.pool > 0) {
@@ -183,6 +183,9 @@ SendPool.drainLoop = async function () {
SendPool.dispatch(task)
.then(async (result) => {
SendPool._inFlight.delete(task.queueId);
+ if (result.fallback) {
+ winston.warn(`[activitypub/send] RFC 9421 request failed (${result.fallback}); retrying with draft signature`);
+ }
if (result.success) {
await SendPool.handleResult(queueId, {
...task,
@@ -232,7 +235,7 @@ SendPool.drainLoop = async function () {
SendPool.shutdown = function () {
SendPool._draining = false;
- // Graceful shutdown — let workers finish current tasks
+ // Graceful shutdown, let workers finish current tasks
SendPool._pool.terminate(false, 10000).catch(() => {
winston.warn('[activitypub/send] Workers did not exit gracefully');
});
diff --git a/src/activitypub/sendWorker.js b/src/activitypub/sendWorker.js
index 760a66004e..289b3a4903 100644
--- a/src/activitypub/sendWorker.js
+++ b/src/activitypub/sendWorker.js
@@ -4,7 +4,6 @@ const { fetch, Agent } = require('undici');
const { check, lookup } = require('../ssrf');
const Signatures = require('./signatures');
const nconf = require('nconf');
-const winston = require('winston');
const { version } = require('../../package.json');
const agent = new Agent({
@@ -84,14 +83,13 @@ async function send({ id, uri, payload, digest, key, keyId }) {
}
// Fall back to signing with the draft method if the RFC 9421 request failed
- winston.warn(`[activitypub/sendWorker] RFC 9421 request failed (${rfcResult.error}); retrying with draft signature`);
const draftHeaders = await Signatures.sign({ key, keyId }, uri, 'POST', digest);
const draftResult = await attemptSend({ uri, headers: draftHeaders, payload, userAgent });
if (draftResult.success) {
- return { id, success: true };
+ return { id, success: true, fallback: rfcResult.error };
}
- return { id, success: false, error: draftResult.error };
+ return { id, success: false, error: draftResult.error, fallback: rfcResult.error };
} catch (e) {
return { id, success: false, error: e.message || 'unknown error' };
}