From 757312ba5244ae36e192259e5b58f25b33f7d44f Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat, 9 Feb 2019 13:01:21 +0900 Subject: Limit the parallelism of AP object processing (#4193) --- src/remote/activitypub/models/note.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/remote/activitypub/models/note.ts') diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts index 790f2f9590..32ea13e6f8 100644 --- a/src/remote/activitypub/models/note.ts +++ b/src/remote/activitypub/models/note.ts @@ -1,4 +1,5 @@ import * as mongo from 'mongodb'; +import * as promiseLimit from 'promise-limit'; import config from '../../../config'; import Resolver from '../resolver'; @@ -16,6 +17,7 @@ import { unique, concat, difference } from '../../../prelude/array'; import { extractPollFromQuestion } from './question'; import vote from '../../../services/note/polls/vote'; import { apLogger } from '../logger'; +import { IDriveFile } from '../../../models/drive-file'; const logger = apLogger; @@ -92,9 +94,10 @@ export async function createNote(value: any, resolver?: Resolver, silent = false // TODO: attachmentは必ずしもImageではない // TODO: attachmentは必ずしも配列ではない // Noteがsensitiveなら添付もsensitiveにする + const limit = promiseLimit(2); const files = note.attachment .map(attach => attach.sensitive = note.sensitive) - ? await Promise.all(note.attachment.map(x => resolveImage(actor, x))) + ? await Promise.all(note.attachment.map(x => limit(() => resolveImage(actor, x)) as Promise)) : []; // リプライ @@ -233,8 +236,9 @@ async function extractMentionedUsers(actor: IRemoteUser, to: string[], cc: strin const ignoreUris = ['https://www.w3.org/ns/activitystreams#Public', `${actor.uri}/followers`]; const uris = difference(unique(concat([to || [], cc || []])), ignoreUris); + const limit = promiseLimit(2); const users = await Promise.all( - uris.map(async uri => await resolvePerson(uri, null, resolver).catch(() => null)) + uris.map(uri => limit(() => resolvePerson(uri, null, resolver).catch(() => null)) as Promise) ); return users.filter(x => x != null); -- cgit v1.2.3-freya