summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CHANGELOG.md1
-rw-r--r--packages/backend/src/core/entities/NoteEntityService.ts12
-rw-r--r--packages/backend/src/misc/loader.ts52
-rw-r--r--packages/backend/test/unit/misc/loader.ts88
4 files changed, 152 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f2b8ac44d..4f9ba288d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
- Enhance: タイムライン取得時のパフォーマンスを大幅に向上
- Enhance: ハイライト取得時のパフォーマンスを大幅に向上
- Enhance: トレンドハッシュタグ取得時のパフォーマンスを大幅に向上
+- Enhance: WebSocket接続が多い場合のパフォーマンスを向上
- Enhance: 不要なPostgreSQLのインデックスを削除しパフォーマンスを向上
- Fix: 連合なしアンケートに投票をするとUpdateがリモートに配信されてしまうのを修正
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index e45a7992bb..abe4aafd6e 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -17,6 +17,7 @@ import type { MiNoteReaction } from '@/models/NoteReaction.js';
import type { UsersRepository, NotesRepository, FollowingsRepository, PollsRepository, PollVotesRepository, NoteReactionsRepository, ChannelsRepository } from '@/models/_.js';
import { bindThis } from '@/decorators.js';
import { isNotNull } from '@/misc/is-not-null.js';
+import { DebounceLoader } from '@/misc/loader.js';
import type { OnModuleInit } from '@nestjs/common';
import type { CustomEmojiService } from '../CustomEmojiService.js';
import type { ReactionService } from '../ReactionService.js';
@@ -29,6 +30,7 @@ export class NoteEntityService implements OnModuleInit {
private driveFileEntityService: DriveFileEntityService;
private customEmojiService: CustomEmojiService;
private reactionService: ReactionService;
+ private noteLoader = new DebounceLoader(this.findNoteOrFail);
constructor(
private moduleRef: ModuleRef,
@@ -285,7 +287,7 @@ export class NoteEntityService implements OnModuleInit {
}, options);
const meId = me ? me.id : null;
- const note = typeof src === 'object' ? src : await this.notesRepository.findOneOrFail({ where: { id: src }, relations: ['user'] });
+ const note = typeof src === 'object' ? src : await this.noteLoader.load(src);
const host = note.userHost;
let text = note.text;
@@ -450,4 +452,12 @@ export class NoteEntityService implements OnModuleInit {
}
return emojis.filter(x => x.name != null && x.host != null) as { name: string; host: string; }[];
}
+
+ @bindThis
+ private findNoteOrFail(id: string): Promise<MiNote> {
+ return this.notesRepository.findOneOrFail({
+ where: { id },
+ relations: ['user'],
+ });
+ }
}
diff --git a/packages/backend/src/misc/loader.ts b/packages/backend/src/misc/loader.ts
new file mode 100644
index 0000000000..25f7b54d31
--- /dev/null
+++ b/packages/backend/src/misc/loader.ts
@@ -0,0 +1,52 @@
+export type FetchFunction<K, V> = (key: K) => Promise<V>;
+
+type ResolveReject<V> = Parameters<ConstructorParameters<typeof Promise<V>>[0]>;
+
+type ResolverPair<V> = {
+ resolve: ResolveReject<V>[0];
+ reject: ResolveReject<V>[1];
+};
+
+export class DebounceLoader<K, V> {
+ private resolverMap = new Map<K, ResolverPair<V>>();
+ private promiseMap = new Map<K, Promise<V>>();
+ private resolvedPromise = Promise.resolve();
+ constructor(private loadFn: FetchFunction<K, V>) {}
+
+ public load(key: K): Promise<V> {
+ const promise = this.promiseMap.get(key);
+ if (typeof promise !== 'undefined') {
+ return promise;
+ }
+
+ const isFirst = this.promiseMap.size === 0;
+ const newPromise = new Promise<V>((resolve, reject) => {
+ this.resolverMap.set(key, { resolve, reject });
+ });
+ this.promiseMap.set(key, newPromise);
+
+ if (isFirst) {
+ this.enqueueDebouncedLoadJob();
+ }
+
+ return newPromise;
+ }
+
+ private runDebouncedLoad(): void {
+ const resolvers = [...this.resolverMap];
+ this.resolverMap.clear();
+ this.promiseMap.clear();
+
+ for (const [key, { resolve, reject }] of resolvers) {
+ this.loadFn(key).then(resolve, reject);
+ }
+ }
+
+ private enqueueDebouncedLoadJob(): void {
+ this.resolvedPromise.then(() => {
+ process.nextTick(() => {
+ this.runDebouncedLoad();
+ });
+ });
+ }
+}
diff --git a/packages/backend/test/unit/misc/loader.ts b/packages/backend/test/unit/misc/loader.ts
new file mode 100644
index 0000000000..fa37950951
--- /dev/null
+++ b/packages/backend/test/unit/misc/loader.ts
@@ -0,0 +1,88 @@
+import { DebounceLoader } from '@/misc/loader.js';
+
+class Mock {
+ loadCountByKey = new Map<number, number>();
+ load = async (key: number): Promise<number> => {
+ const count = this.loadCountByKey.get(key);
+ if (typeof count === 'undefined') {
+ this.loadCountByKey.set(key, 1);
+ } else {
+ this.loadCountByKey.set(key, count + 1);
+ }
+ return key * 2;
+ };
+ reset() {
+ this.loadCountByKey.clear();
+ }
+}
+
+describe(DebounceLoader, () => {
+ describe('single request', () => {
+ it('loads once', async () => {
+ const mock = new Mock();
+ const loader = new DebounceLoader(mock.load);
+ expect(await loader.load(7)).toBe(14);
+ expect(mock.loadCountByKey.size).toBe(1);
+ expect(mock.loadCountByKey.get(7)).toBe(1);
+ });
+ });
+
+ describe('two duplicated requests at same time', () => {
+ it('loads once', async () => {
+ const mock = new Mock();
+ const loader = new DebounceLoader(mock.load);
+ const [v1, v2] = await Promise.all([
+ loader.load(7),
+ loader.load(7),
+ ]);
+ expect(v1).toBe(14);
+ expect(v2).toBe(14);
+ expect(mock.loadCountByKey.size).toBe(1);
+ expect(mock.loadCountByKey.get(7)).toBe(1);
+ });
+ });
+
+ describe('two different requests at same time', () => {
+ it('loads twice', async () => {
+ const mock = new Mock();
+ const loader = new DebounceLoader(mock.load);
+ const [v1, v2] = await Promise.all([
+ loader.load(7),
+ loader.load(13),
+ ]);
+ expect(v1).toBe(14);
+ expect(v2).toBe(26);
+ expect(mock.loadCountByKey.size).toBe(2);
+ expect(mock.loadCountByKey.get(7)).toBe(1);
+ expect(mock.loadCountByKey.get(13)).toBe(1);
+ });
+ });
+
+ describe('non-continuous same two requests', () => {
+ it('loads twice', async () => {
+ const mock = new Mock();
+ const loader = new DebounceLoader(mock.load);
+ expect(await loader.load(7)).toBe(14);
+ expect(mock.loadCountByKey.size).toBe(1);
+ expect(mock.loadCountByKey.get(7)).toBe(1);
+ mock.reset();
+ expect(await loader.load(7)).toBe(14);
+ expect(mock.loadCountByKey.size).toBe(1);
+ expect(mock.loadCountByKey.get(7)).toBe(1);
+ });
+ });
+
+ describe('non-continuous different two requests', () => {
+ it('loads twice', async () => {
+ const mock = new Mock();
+ const loader = new DebounceLoader(mock.load);
+ expect(await loader.load(7)).toBe(14);
+ expect(mock.loadCountByKey.size).toBe(1);
+ expect(mock.loadCountByKey.get(7)).toBe(1);
+ mock.reset();
+ expect(await loader.load(13)).toBe(26);
+ expect(mock.loadCountByKey.size).toBe(1);
+ expect(mock.loadCountByKey.get(13)).toBe(1);
+ });
+ });
+});
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-05-03 17:59:11 +0000