perf(server): refactor and performance improvements

19 files changed, 59 insertions, 49 deletions

diff --git a/packages/backend/src/server/api/authenticate.ts b/packages/backend/src/server/api/authenticate.ts
index 7fdf14666e..8fb397ca5f 100644
--- a/packages/backend/src/server/api/authenticate.ts
+++ b/packages/backend/src/server/api/authenticate.ts
@@ -1,7 +1,12 @@
 import isNativeToken from './common/is-native-token.js';
-import { User } from '@/models/entities/user.js';
+import { CacheableLocalUser, ILocalUser } from '@/models/entities/user.js';
 import { Users, AccessTokens, Apps } from '@/models/index.js';
 import { AccessToken } from '@/models/entities/access-token.js';
+import { Cache } from '@/misc/cache.js';
+import { App } from '@/models/entities/app.js';
+import { localUserByIdCache, localUserByNativeTokenCache } from '@/services/user-cache.js';
+
+const appCache = new Cache<App>(Infinity);
 
 export class AuthenticationError extends Error {
 	constructor(message: string) {
@@ -10,15 +15,15 @@ export class AuthenticationError extends Error {
 	}
 }
 
-export default async (token: string | null): Promise<[User | null | undefined, AccessToken | null | undefined]> => {
+export default async (token: string | null): Promise<[CacheableLocalUser | null | undefined, AccessToken | null | undefined]> => {
 	if (token == null) {
 		return [null, null];
 	}
 
 	if (isNativeToken(token)) {
-		// Fetch user
-		const user = await Users
-			.findOne({ token });
+		// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる
+		const user = await localUserByNativeTokenCache.fetch(token,
+			() => Users.findOne({ token }).then(x => x || null) as Promise<ILocalUser | null>);
 
 		if (user == null) {
 			throw new AuthenticationError('user not found');
@@ -42,14 +47,14 @@ export default async (token: string | null): Promise<[User | null | undefined, A
 			lastUsedAt: new Date(),
 		});
 
-		const user = await Users
-			.findOne({
+		const user = await localUserByIdCache.fetch(accessToken.userId,
+			() => Users.findOne({
 				id: accessToken.userId, // findOne(accessToken.userId) のように書かないのは後方互換性のため
-			});
+			}) as Promise<ILocalUser>);
 
 		if (accessToken.appId) {
-			const app = await Apps
-				.findOneOrFail(accessToken.appId);
+			const app = await appCache.fetch(accessToken.appId,
+				() => Apps.findOneOrFail(accessToken.appId!));
 
 			return [user, {
 				id: accessToken.id,
diff --git a/packages/backend/src/server/api/call.ts b/packages/backend/src/server/api/call.ts
index 5c5ef66019..9a85e4565b 100644
--- a/packages/backend/src/server/api/call.ts
+++ b/packages/backend/src/server/api/call.ts
@@ -1,7 +1,7 @@
 import Koa from 'koa';
 import { performance } from 'perf_hooks';
 import { limiter } from './limiter.js';
-import { User } from '@/models/entities/user.js';
+import { CacheableLocalUser, User } from '@/models/entities/user.js';
 import endpoints, { IEndpoint } from './endpoints.js';
 import { ApiError } from './error.js';
 import { apiLogger } from './logger.js';
@@ -13,7 +13,7 @@ const accessDenied = {
 	id: '56f35758-7dd5-468b-8439-5d6fb8ec9b8e',
 };
 
-export default async (endpoint: string, user: User | null | undefined, token: AccessToken | null | undefined, data: any, ctx?: Koa.Context) => {
+export default async (endpoint: string, user: CacheableLocalUser | null | undefined, token: AccessToken | null | undefined, data: any, ctx?: Koa.Context) => {
 	const isSecure = user != null && token == null;
 
 	const ep = endpoints.find(e => e.name === endpoint);
diff --git a/packages/backend/src/server/api/define.ts b/packages/backend/src/server/api/define.ts
index 4e6d041a29..1529894341 100644
--- a/packages/backend/src/server/api/define.ts
+++ b/packages/backend/src/server/api/define.ts
@@ -1,30 +1,16 @@
 import * as fs from 'node:fs';
 import Ajv from 'ajv';
-import { ILocalUser } from '@/models/entities/user.js';
+import { CacheableLocalUser, ILocalUser } from '@/models/entities/user.js';
 import { IEndpointMeta } from './endpoints.js';
 import { ApiError } from './error.js';
 import { Schema, SchemaType } from '@/misc/schema.js';
 import { AccessToken } from '@/models/entities/access-token.js';
 
-type SimpleUserInfo = {
-	id: ILocalUser['id'];
-	createdAt: ILocalUser['createdAt'];
-	host: ILocalUser['host'];
-	username: ILocalUser['username'];
-	uri: ILocalUser['uri'];
-	inbox: ILocalUser['inbox'];
-	sharedInbox: ILocalUser['sharedInbox'];
-	isAdmin: ILocalUser['isAdmin'];
-	isModerator: ILocalUser['isModerator'];
-	isSilenced: ILocalUser['isSilenced'];
-	showTimelineReplies: ILocalUser['showTimelineReplies'];
-};
-
 export type Response = Record<string, any> | void;
 
 // TODO: paramsの型をT['params']のスキーマ定義から推論する
 type executor<T extends IEndpointMeta, Ps extends Schema> =
-	(params: SchemaType<Ps>, user: T['requireCredential'] extends true ? SimpleUserInfo : SimpleUserInfo | null, token: AccessToken | null, file?: any, cleanup?: () => any) =>
+	(params: SchemaType<Ps>, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any, cleanup?: () => any) =>
 		Promise<T['res'] extends undefined ? Response : SchemaType<NonNullable<T['res']>>>;
 
 const ajv = new Ajv({
@@ -34,11 +20,11 @@ const ajv = new Ajv({
 ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/);
 
 export default function <T extends IEndpointMeta, Ps extends Schema>(meta: T, paramDef: Ps, cb: executor<T, Ps>)
-		: (params: any, user: T['requireCredential'] extends true ? SimpleUserInfo : SimpleUserInfo | null, token: AccessToken | null, file?: any) => Promise<any> {
+		: (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any) => Promise<any> {
 
 	const validate = ajv.compile(paramDef);
 
-	return (params: any, user: T['requireCredential'] extends true ? SimpleUserInfo : SimpleUserInfo | null, token: AccessToken | null, file?: any) => {
+	return (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any) => {
 		function cleanup() {
 			fs.unlink(file.path, () => {});
 		}
diff --git a/packages/backend/src/server/api/endpoints/admin/moderators/add.ts b/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
index 4206e3a3c2..60bf0ff09c 100644
--- a/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
@@ -1,5 +1,6 @@
 import define from '../../../define.js';
 import { Users } from '@/models/index.js';
+import { publishInternalEvent } from '@/services/stream.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -31,4 +32,6 @@ export default define(meta, paramDef, async (ps) => {
 	await Users.update(user.id, {
 		isModerator: true,
 	});
+
+	publishInternalEvent('userChangeModeratorState', { id: user.id, isModerator: true });
 });
diff --git a/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts b/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
index 143119bfe4..cf9d7c14a8 100644
--- a/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
+++ b/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
@@ -27,4 +27,6 @@ export default define(meta, paramDef, async (ps) => {
 	await Users.update(user.id, {
 		isModerator: false,
 	});
+
+	publishInternalEvent('userChangeModeratorState', { id: user.id, isModerator: false });
 });
diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts
index a435dcc288..564b8a0261 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -29,7 +29,8 @@ export default define(meta, paramDef, async (ps, me) => {
 		throw new Error('user not found');
 	}
 
-	if ((me.isModerator && !me.isAdmin) && user.isAdmin) {
+	const _me = await Users.findOneOrFail(me.id);
+	if ((_me.isModerator && !_me.isAdmin) && user.isAdmin) {
 		throw new Error('cannot show info of admin');
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/admin/silence-user.ts b/packages/backend/src/server/api/endpoints/admin/silence-user.ts
index 4a74c3fb00..4cbed1cf9c 100644
--- a/packages/backend/src/server/api/endpoints/admin/silence-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/silence-user.ts
@@ -1,6 +1,7 @@
 import define from '../../define.js';
 import { Users } from '@/models/index.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
+import { publishInternalEvent } from '@/services/stream.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -33,6 +34,8 @@ export default define(meta, paramDef, async (ps, me) => {
 		isSilenced: true,
 	});
 
+	publishInternalEvent('userChangeSilencedState', { id: user.id, isSilenced: true });
+
 	insertModerationLog(me, 'silence', {
 		targetId: user.id,
 	});
diff --git a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
index 4e6366aa18..6c66288117 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
@@ -1,6 +1,7 @@
 import define from '../../define.js';
 import { Users } from '@/models/index.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
+import { publishInternalEvent } from '@/services/stream.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -29,6 +30,8 @@ export default define(meta, paramDef, async (ps, me) => {
 		isSilenced: false,
 	});
 
+	publishInternalEvent('userChangeSilencedState', { id: user.id, isSilenced: false });
+
 	insertModerationLog(me, 'unsilence', {
 		targetId: user.id,
 	});
diff --git a/packages/backend/src/server/api/endpoints/drive/files/delete.ts b/packages/backend/src/server/api/endpoints/drive/files/delete.ts
index 5f565a63fb..eac8eabfc0 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/delete.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/delete.ts
@@ -2,7 +2,7 @@ import { deleteFile } from '@/services/drive/delete-file.js';
 import { publishDriveStream } from '@/services/stream.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles } from '@/models/index.js';
+import { DriveFiles, Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],
@@ -42,7 +42,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw new ApiError(meta.errors.noSuchFile);
 	}
 
-	if (!user.isAdmin && !user.isModerator && (file.userId !== user.id)) {
+	if ((!user.isAdmin && !user.isModerator) && (file.userId !== user.id)) {
 		throw new ApiError(meta.errors.accessDenied);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/drive/files/show.ts b/packages/backend/src/server/api/endpoints/drive/files/show.ts
index 181365c7e6..16b313cabf 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/show.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/show.ts
@@ -1,7 +1,7 @@
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
-import { DriveFiles } from '@/models/index.js';
+import { DriveFiles, Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],
@@ -70,7 +70,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw new ApiError(meta.errors.noSuchFile);
 	}
 
-	if (!user.isAdmin && !user.isModerator && (file.userId !== user.id)) {
+	if ((!user.isAdmin && !user.isModerator) && (file.userId !== user.id)) {
 		throw new ApiError(meta.errors.accessDenied);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts
index ab8e4aeeb2..30d7847b5b 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts
@@ -1,7 +1,7 @@
 import { publishDriveStream } from '@/services/stream.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles, DriveFolders } from '@/models/index.js';
+import { DriveFiles, DriveFolders, Users } from '@/models/index.js';
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits.js';
 
 export const meta = {
@@ -64,7 +64,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw new ApiError(meta.errors.noSuchFile);
 	}
 
-	if (!user.isAdmin && !user.isModerator && (file.userId !== user.id)) {
+	if ((!user.isAdmin && !user.isModerator) && (file.userId !== user.id)) {
 		throw new ApiError(meta.errors.accessDenied);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
index 771c98b212..ae23d2482e 100644
--- a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
+++ b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
@@ -1,5 +1,5 @@
 import bcrypt from 'bcryptjs';
-import { publishMainStream, publishUserEvent } from '@/services/stream.js';
+import { publishInternalEvent, publishMainStream, publishUserEvent } from '@/services/stream.js';
 import generateUserToken from '../../common/generate-native-user-token.js';
 import define from '../../define.js';
 import { Users, UserProfiles } from '@/models/index.js';
@@ -20,6 +20,9 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
+	const freshUser = await Users.findOneOrFail(user.id);
+	const oldToken = freshUser.token;
+
 	const profile = await UserProfiles.findOneOrFail(user.id);
 
 	// Compare password
@@ -29,14 +32,14 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw new Error('incorrect password');
 	}
 
-	// Generate secret
-	const secret = generateUserToken();
+	const newToken = generateUserToken();
 
 	await Users.update(user.id, {
-		token: secret,
+		token: newToken,
 	});
 
 	// Publish event
+	publishInternalEvent('userTokenRegenerated', { id: user.id, oldToken, newToken });
 	publishMainStream(user.id, 'myTokenRegenerated');
 
 	// Terminate streaming
diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts
index 22ff2275ca..a1ab06d461 100644
--- a/packages/backend/src/server/api/endpoints/notes/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/delete.ts
@@ -48,7 +48,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw e;
 	});
 
-	if (!user.isAdmin && !user.isModerator && (note.userId !== user.id)) {
+	if ((!user.isAdmin && !user.isModerator) && (note.userId !== user.id)) {
 		throw new ApiError(meta.errors.accessDenied);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index 26aaa0919c..09a8194665 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -2,7 +2,7 @@ import define from '../../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { ApiError } from '../../error.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Notes } from '@/models/index.js';
+import { Notes, Users } from '@/models/index.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
 import { generateMutedInstanceQuery } from '../../common/generate-muted-instance-query.js';
 import { activeUsersChart } from '@/services/chart/index.js';
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index 9bcb64b656..7c9c122963 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -2,7 +2,7 @@ import define from '../../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { ApiError } from '../../error.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Followings, Notes } from '@/models/index.js';
+import { Followings, Notes, Users } from '@/models/index.js';
 import { Brackets } from 'typeorm';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
@@ -56,7 +56,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const m = await fetchMeta();
-	if (m.disableLocalTimeline && !user.isAdmin && !user.isModerator) {
+	if (m.disableLocalTimeline && (!user.isAdmin && !user.isModerator)) {
 		throw new ApiError(meta.errors.stlDisabled);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 12fc88b1fd..bb0bbe2a20 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -1,7 +1,7 @@
 import define from '../../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { ApiError } from '../../error.js';
-import { Notes } from '@/models/index.js';
+import { Notes, Users } from '@/models/index.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts
index 70db12fb14..3555424fa6 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts
@@ -1,5 +1,4 @@
 import define from '../../define.js';
-import { getNote } from '../../common/getters.js';
 import { ApiError } from '../../error.js';
 import { NoteReactions } from '@/models/index.js';
 import { DeepPartial } from 'typeorm';
diff --git a/packages/backend/src/server/api/limiter.ts b/packages/backend/src/server/api/limiter.ts
index 7e6b93b39f..e74db8466e 100644
--- a/packages/backend/src/server/api/limiter.ts
+++ b/packages/backend/src/server/api/limiter.ts
@@ -2,12 +2,12 @@ import Limiter from 'ratelimiter';
 import { redisClient } from '../../db/redis.js';
 import { IEndpoint } from './endpoints.js';
 import * as Acct from '@/misc/acct.js';
-import { User } from '@/models/entities/user.js';
+import { CacheableLocalUser, User } from '@/models/entities/user.js';
 import Logger from '@/services/logger.js';
 
 const logger = new Logger('limiter');
 
-export const limiter = (endpoint: IEndpoint & { meta: { limit: NonNullable<IEndpoint['meta']['limit']> } }, user: User) => new Promise<void>((ok, reject) => {
+export const limiter = (endpoint: IEndpoint & { meta: { limit: NonNullable<IEndpoint['meta']['limit']> } }, user: CacheableLocalUser) => new Promise<void>((ok, reject) => {
 	const limitation = endpoint.meta.limit;
 
 	const key = Object.prototype.hasOwnProperty.call(limitation, 'key')
diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts
index 90cf59038d..bea863eb7c 100644
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@@ -18,6 +18,11 @@ import { Packed } from '@/misc/schema.js';
 
 //#region Stream type-body definitions
 export interface InternalStreamTypes {
+	userChangeSuspendedState: { id: User['id']; isSuspended: User['isSuspended']; };
+	userChangeSilencedState: { id: User['id']; isSilenced: User['isSilenced']; };
+	userChangeModeratorState: { id: User['id']; isModerator: User['isModerator']; };
+	userTokenRegenerated: { id: User['id']; oldToken: User['token']; newToken: User['token']; };
+	remoteUserUpdated: { id: User['id']; };
 	antennaCreated: Antenna;
 	antennaDeleted: Antenna;
 	antennaUpdated: Antenna;