perf(server): refactor and performance improvements

packages/backend/src/services/following/reject.ts

@@ -7,8 +7,17 @@ import { User, ILocalUser, IRemoteUser } from '@/models/entities/user.js';
 import { Users, FollowRequests, Followings } from '@/models/index.js';
 import { decrementFollowing } from './delete.js';
 
-type Local = ILocalUser | { id: User['id']; host: User['host']; uri: User['host'] };
-type Remote = IRemoteUser;
+type Local = ILocalUser | {
+	id: ILocalUser['id'];
+	host: ILocalUser['host'];
+	uri: ILocalUser['uri']
+};
+type Remote = IRemoteUser | {
+	id: IRemoteUser['id'];
+	host: IRemoteUser['host'];
+	uri: IRemoteUser['uri'];
+	inbox: IRemoteUser['inbox'];
+};
 type Both = Local | Remote;
 
 /**

packages/backend/src/services/messages/create.ts

@@ -1,4 +1,4 @@
-import { User } from '@/models/entities/user.js';
+import { CacheableUser, User } from '@/models/entities/user.js';
 import { UserGroup } from '@/models/entities/user-group.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { MessagingMessages, UserGroupJoinings, Mutings, Users } from '@/models/index.js';
@@ -13,7 +13,7 @@ import renderCreate from '@/remote/activitypub/renderer/create.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import { deliver } from '@/queue/index.js';
 
-export async function createMessage(user: { id: User['id']; host: User['host']; }, recipientUser: User | undefined, recipientGroup: UserGroup | undefined, text: string | null | undefined, file: DriveFile | null, uri?: string) {
+export async function createMessage(user: { id: User['id']; host: User['host']; }, recipientUser: CacheableUser | undefined, recipientGroup: UserGroup | undefined, text: string | null | undefined, file: DriveFile | null, uri?: string) {
 	const message = {
 		id: genId(),
 		createdAt: new Date(),

packages/backend/src/services/note/create.ts

@@ -38,8 +38,6 @@ import { endedPollNotificationQueue } from '@/queue/queues.js';
 import { Cache } from '@/misc/cache.js';
 import { UserProfile } from '@/models/entities/user-profile.js';
 
-const usersCache = new Cache<MinimumUser>(Infinity);
-
 const mutedWordsCache = new Cache<{ userId: UserProfile['userId']; mutedWords: UserProfile['mutedWords']; }[]>(1000 * 60 * 5);
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
@@ -212,7 +210,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 	tags = tags.filter(tag => Array.from(tag || '').length <= 128).splice(0, 32);
 
 	if (data.reply && (user.id !== data.reply.userId) && !mentionedUsers.some(u => u.id === data.reply!.userId)) {
-		mentionedUsers.push(await usersCache.fetch(data.reply.userId, () => Users.findOneOrFail(data.reply!.userId)));
+		mentionedUsers.push(await Users.findOneOrFail(data.reply!.userId));
 	}
 
 	if (data.visibility === 'specified') {
@@ -225,7 +223,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 		}
 
 		if (data.reply && !data.visibleUsers.some(x => x.id === data.reply!.userId)) {
-			data.visibleUsers.push(await usersCache.fetch(data.reply.userId, () => Users.findOneOrFail(data.reply!.userId)));
+			data.visibleUsers.push(await Users.findOneOrFail(data.reply!.userId));
 		}
 	}
 

packages/backend/src/services/note/delete.ts

@@ -20,7 +20,7 @@ import { Brackets, In } from 'typeorm';
  * @param user 投稿者
  * @param note 投稿
  */
-export default async function(user: User, note: Note, quiet = false) {
+export default async function(user: { id: User['id']; uri: User['uri']; host: User['host']; }, note: Note, quiet = false) {
 	const deletedAt = new Date();
 
 	// この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき
@@ -131,7 +131,7 @@ async function getMentionedRemoteUsers(note: Note) {
 	}) as IRemoteUser[];
 }
 
-async function deliverToConcerned(user: ILocalUser, note: Note, content: any) {
+async function deliverToConcerned(user: { id: ILocalUser['id']; host: null; }, note: Note, content: any) {
 	deliverToFollowers(user, content);
 	deliverToRelays(user, content);
 	const remoteUsers = await getMentionedRemoteUsers(note);

packages/backend/src/services/note/polls/vote.ts

@@ -1,12 +1,12 @@
 import { publishNoteStream } from '@/services/stream.js';
-import { User } from '@/models/entities/user.js';
+import { CacheableUser, User } from '@/models/entities/user.js';
 import { Note } from '@/models/entities/note.js';
 import { PollVotes, NoteWatchings, Polls, Blockings } from '@/models/index.js';
 import { Not } from 'typeorm';
 import { genId } from '@/misc/gen-id.js';
 import { createNotification } from '../../create-notification.js';
 
-export default async function(user: User, note: Note, choice: number) {
+export default async function(user: CacheableUser, note: Note, choice: number) {
 	const poll = await Polls.findOne(note.id);
 
 	if (poll == null) throw new Error('poll not found');

packages/backend/src/services/relay.ts

@@ -6,9 +6,13 @@ import { deliver } from '@/queue/index.js';
 import { ILocalUser, User } from '@/models/entities/user.js';
 import { Users, Relays } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import { Cache } from '@/misc/cache.js';
+import { Relay } from '@/models/entities/relay.js';
 
 const ACTOR_USERNAME = 'relay.actor' as const;
 
+const relaysCache = new Cache<Relay[]>(1000 * 60 * 10);
+
 export async function getRelayActor(): Promise<ILocalUser> {
 	const user = await Users.findOne({
 		host: null,
@@ -78,9 +82,9 @@ export async function relayRejected(id: string) {
 export async function deliverToRelays(user: { id: User['id']; host: null; }, activity: any) {
 	if (activity == null) return;
 
-	const relays = await Relays.find({
+	const relays = await relaysCache.fetch(null, () => Relays.find({
 		status: 'accepted',
-	});
+	}));
 	if (relays.length === 0) return;
 
 	const copy = JSON.parse(JSON.stringify(activity));

packages/backend/src/services/suspend-user.ts

@@ -5,8 +5,11 @@ import config from '@/config/index.js';
 import { User } from '@/models/entities/user.js';
 import { Users, Followings } from '@/models/index.js';
 import { Not, IsNull } from 'typeorm';
+import { publishInternalEvent } from './stream';
 
 export async function doPostSuspend(user: { id: User['id']; host: User['host'] }) {
+	publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
+
 	if (Users.isLocalUser(user)) {
 		// 知り得る全SharedInboxにDelete配信
 		const content = renderActivity(renderDelete(`${config.url}/users/${user.id}`, user));

packages/backend/src/services/unsuspend-user.ts

@@ -6,8 +6,11 @@ import config from '@/config/index.js';
 import { User } from '@/models/entities/user.js';
 import { Users, Followings } from '@/models/index.js';
 import { Not, IsNull } from 'typeorm';
+import { publishInternalEvent } from './stream';
 
 export async function doPostUnsuspend(user: User) {
+	publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
+
 	if (Users.isLocalUser(user)) {
 		// 知り得る全SharedInboxにUndo Delete配信
 		const content = renderActivity(renderUndo(renderDelete(`${config.url}/users/${user.id}`, user), user));

packages/backend/src/services/user-cache.ts

@@ -0,0 +1,44 @@
+import { CacheableLocalUser, CacheableUser, ILocalUser, User } from '@/models/entities/user.js';
+import { Users } from '@/models/index.js';
+import { Cache } from '@/misc/cache.js';
+import { subsdcriber } from '@/db/redis.js';
+
+export const userByIdCache = new Cache<CacheableUser>(Infinity);
+export const localUserByNativeTokenCache = new Cache<CacheableLocalUser | null>(Infinity);
+export const localUserByIdCache = new Cache<CacheableLocalUser>(Infinity);
+export const uriPersonCache = new Cache<CacheableUser | null>(Infinity);
+
+subsdcriber.on('message', async (_, data) => {
+	const obj = JSON.parse(data);
+
+	if (obj.channel === 'internal') {
+		const { type, body } = obj.message;
+		switch (type) {
+			case 'userChangeSuspendedState':
+			case 'userChangeSilencedState':
+			case 'userChangeModeratorState':
+			case 'remoteUserUpdated': {
+				const user = await Users.findOneOrFail(body.id);
+				userByIdCache.set(user.id, user);
+				for (const [k, v] of uriPersonCache.cache.entries()) {
+					if (v.value?.id === user.id) {
+						uriPersonCache.set(k, user);
+					}
+				}
+				if (Users.isLocalUser(user)) {
+					localUserByNativeTokenCache.set(user.token, user);
+					localUserByIdCache.set(user.id, user);
+				}
+				break;
+			}
+			case 'userTokenRegenerated': {
+				const user = await Users.findOneOrFail(body.id) as ILocalUser;
+				localUserByNativeTokenCache.delete(body.oldToken);
+				localUserByNativeTokenCache.set(body.newToken, user);
+				break;
+			}
+			default:
+				break;
+		}
+	}
+});