Node.js based forum software built for the modern web
fix: wrap batch processing behind setImmediate() so that it runs on the next iteration of the event loop
Julian Lam531d20af3e77
diff --git a/src/activitypub/index.js b/src/activitypub/index.jsindex deb39c39e6..03ba03989e 100644--- a/src/activitypub/index.js+++ b/src/activitypub/index.js@@ -439,35 +439,37 @@ ActivityPub.send = async (type, id, targets, payload) => {interval: numCores === 1 ? 500 : 100,};const keyData = await ActivityPub.getPrivateKey(type, id);- batch.processArray(inboxes, async (inboxBatch) => {- const retryQueueAdd = [];- const retryQueuedSet = [];-- await Promise.all(inboxBatch.map(async (uri) => {- const ok = await ActivityPub._sendMessage(uri, keyData, payload, digest);- if (!ok) {- const queueId = crypto.createHash('sha256').update(`${type}:${id}:${uri}`).digest('hex');- const nextTryOn = Date.now() + oneMinute;- retryQueueAdd.push(['ap:retry:queue', nextTryOn, queueId]);- retryQueuedSet.push([`ap:retry:queue:${queueId}`, {- queueId,- uri,- id,- type,- attempts: 1,- timestamp: nextTryOn,- payload: JSON.stringify(payload),- }]);- }- }));+ setImmediate(() => {+ batch.processArray(inboxes, async (inboxBatch) => {+ const retryQueueAdd = [];+ const retryQueuedSet = [];++ await Promise.all(inboxBatch.map(async (uri) => {+ const ok = await ActivityPub._sendMessage(uri, keyData, payload, digest);+ if (!ok) {+ const queueId = crypto.createHash('sha256').update(`${type}:${id}:${uri}`).digest('hex');+ const nextTryOn = Date.now() + oneMinute;+ retryQueueAdd.push(['ap:retry:queue', nextTryOn, queueId]);+ retryQueuedSet.push([`ap:retry:queue:${queueId}`, {+ queueId,+ uri,+ id,+ type,+ attempts: 1,+ timestamp: nextTryOn,+ payload: JSON.stringify(payload),+ }]);+ }+ }));- if (retryQueueAdd.length) {- await Promise.all([- db.sortedSetAddBulk(retryQueueAdd),- db.setObjectBulk(retryQueuedSet),- ]);- }- }, batchSettings).catch(err => winston.error(err.stack));+ if (retryQueueAdd.length) {+ await Promise.all([+ db.sortedSetAddBulk(retryQueueAdd),+ db.setObjectBulk(retryQueuedSet),+ ]);+ }+ }, batchSettings).catch(err => winston.error(err.stack));+ });};ActivityPub.record = {};