wip

locales/index.d.ts

@@ -4340,6 +4340,10 @@ export interface Locale extends ILocale {
      * リモートサーバーのチャートを生成
      */
     "enableChartsForFederatedInstances": string;
+    /**
+     * リモートサーバーの情報を取得
+     */
+    "enableStatsForFederatedInstances": string;
     /**
      * ノートのアクションにクリップを追加
      */

locales/ja-JP.yml

@@ -1081,6 +1081,7 @@ retryAllQueuesConfirmTitle: "今すぐ再試行しますか？"
 retryAllQueuesConfirmText: "一時的にサーバーの負荷が増大することがあります。"
 enableChartsForRemoteUser: "リモートユーザーのチャートを生成"
 enableChartsForFederatedInstances: "リモートサーバーのチャートを生成"
+enableStatsForFederatedInstances: "リモートサーバーの情報を取得"
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
 reactionsDisplaySize: "リアクションの表示サイズ"
 limitWidthOfReaction: "リアクションの最大横幅を制限し、縮小して表示する"

packages/backend/migration/1727318020265-enableStatsForFederatedInstances.js

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class EnableStatsForFederatedInstances1727318020265 {
+    name = 'EnableStatsForFederatedInstances1727318020265'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableStatsForFederatedInstances" boolean NOT NULL DEFAULT true`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableStatsForFederatedInstances"`);
+    }
+}

packages/backend/src/core/AccountMoveService.ts

@@ -274,13 +274,15 @@ export class AccountMoveService {
 		}
 
 		// Update instance stats by decreasing remote followers count by the number of local followers who were following the old account.
-		if (this.userEntityService.isRemoteUser(oldAccount)) {
+		if (this.meta.enableStatsForFederatedInstances) {
-			this.federatedInstanceService.fetch(oldAccount.host).then(async i => {
+			if (this.userEntityService.isRemoteUser(oldAccount)) {
-				this.instancesRepository.decrement({ id: i.id }, 'followersCount', localFollowerIds.length);
+				this.federatedInstanceService.fetchOrRegister(oldAccount.host).then(async i => {
-				if (this.meta.enableChartsForFederatedInstances) {
+					this.instancesRepository.decrement({ id: i.id }, 'followersCount', localFollowerIds.length);
-					this.instanceChart.updateFollowers(i.host, false);
+					if (this.meta.enableChartsForFederatedInstances) {
-				}
+						this.instanceChart.updateFollowers(i.host, false);
-			});
+					}
+				});
+			}
 		}
 
 		// FIXME: expensive?

packages/backend/src/core/FederatedInstanceService.ts

@@ -47,7 +47,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async fetch(host: string): Promise<MiInstance> {
+	public async fetchOrRegister(host: string): Promise<MiInstance> {
 		host = this.utilityService.toPuny(host);
 
 		const cached = await this.federatedInstanceCache.get(host);

packages/backend/src/core/FetchInstanceMetadataService.ts

@@ -82,7 +82,7 @@ export class FetchInstanceMetadataService {
 
 		try {
 			if (!force) {
-				const _instance = await this.federatedInstanceService.fetch(host);
+				const _instance = await this.federatedInstanceService.fetchOrRegister(host);
 				const now = Date.now();
 				if (_instance && _instance.infoUpdatedAt && (now - _instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24)) {
 					// unlock at the finally caluse

packages/backend/src/core/NoteCreateService.ts

@@ -511,13 +511,15 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}
 
 		// Register host
-		if (this.userEntityService.isRemoteUser(user)) {
+		if (this.meta.enableStatsForFederatedInstances) {
-			this.federatedInstanceService.fetch(user.host).then(async i => {
+			if (this.userEntityService.isRemoteUser(user)) {
-				this.updateNotesCountQueue.enqueue(i.id, 1);
+				this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
-				if (this.meta.enableChartsForFederatedInstances) {
+					this.updateNotesCountQueue.enqueue(i.id, 1);
-					this.instanceChart.updateNote(i.host, note, true);
+					if (this.meta.enableChartsForFederatedInstances) {
-				}
+						this.instanceChart.updateNote(i.host, note, true);
-			});
+					}
+				});
+			}
 		}
 
 		// ハッシュタグ更新

packages/backend/src/core/NoteDeleteService.ts

@@ -106,13 +106,15 @@ export class NoteDeleteService {
 				this.perUserNotesChart.update(user, note, false);
 			}
 
-			if (this.userEntityService.isRemoteUser(user)) {
+			if (this.meta.enableStatsForFederatedInstances) {
-				this.federatedInstanceService.fetch(user.host).then(async i => {
+				if (this.userEntityService.isRemoteUser(user)) {
-					this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1);
+					this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
-					if (this.meta.enableChartsForFederatedInstances) {
+						this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1);
-						this.instanceChart.updateNote(i.host, note, false);
+						if (this.meta.enableChartsForFederatedInstances) {
-					}
+							this.instanceChart.updateNote(i.host, note, false);
-				});
+						}
+					});
+				}
 			}
 		}
 

packages/backend/src/core/UserFollowingService.ts

@@ -302,20 +302,22 @@ export class UserFollowingService implements OnModuleInit {
 			//#endregion
 
 			//#region Update instance stats
-			if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
+			if (this.meta.enableStatsForFederatedInstances) {
-				this.federatedInstanceService.fetch(follower.host).then(async i => {
+				if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-					this.instancesRepository.increment({ id: i.id }, 'followingCount', 1);
+					this.federatedInstanceService.fetchOrRegister(follower.host).then(async i => {
-					if (this.meta.enableChartsForFederatedInstances) {
+						this.instancesRepository.increment({ id: i.id }, 'followingCount', 1);
-						this.instanceChart.updateFollowing(i.host, true);
+						if (this.meta.enableChartsForFederatedInstances) {
-					}
+							this.instanceChart.updateFollowing(i.host, true);
-				});
+						}
-			} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
+					});
-				this.federatedInstanceService.fetch(followee.host).then(async i => {
+				} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
-					this.instancesRepository.increment({ id: i.id }, 'followersCount', 1);
+					this.federatedInstanceService.fetchOrRegister(followee.host).then(async i => {
-					if (this.meta.enableChartsForFederatedInstances) {
+						this.instancesRepository.increment({ id: i.id }, 'followersCount', 1);
-						this.instanceChart.updateFollowers(i.host, true);
+						if (this.meta.enableChartsForFederatedInstances) {
-					}
+							this.instanceChart.updateFollowers(i.host, true);
-				});
+						}
+					});
+				}
 			}
 			//#endregion
 
@@ -434,20 +436,22 @@ export class UserFollowingService implements OnModuleInit {
 			//#endregion
 
 			//#region Update instance stats
-			if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
+			if (this.meta.enableStatsForFederatedInstances) {
-				this.federatedInstanceService.fetch(follower.host).then(async i => {
+				if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-					this.instancesRepository.decrement({ id: i.id }, 'followingCount', 1);
+					this.federatedInstanceService.fetchOrRegister(follower.host).then(async i => {
-					if (this.meta.enableChartsForFederatedInstances) {
+						this.instancesRepository.decrement({ id: i.id }, 'followingCount', 1);
-						this.instanceChart.updateFollowing(i.host, false);
+						if (this.meta.enableChartsForFederatedInstances) {
-					}
+							this.instanceChart.updateFollowing(i.host, false);
-				});
+						}
-			} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
+					});
-				this.federatedInstanceService.fetch(followee.host).then(async i => {
+				} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
-					this.instancesRepository.decrement({ id: i.id }, 'followersCount', 1);
+					this.federatedInstanceService.fetchOrRegister(followee.host).then(async i => {
-					if (this.meta.enableChartsForFederatedInstances) {
+						this.instancesRepository.decrement({ id: i.id }, 'followersCount', 1);
-						this.instanceChart.updateFollowers(i.host, false);
+						if (this.meta.enableChartsForFederatedInstances) {
-					}
+							this.instanceChart.updateFollowers(i.host, false);
-				});
+						}
+					});
+				}
 			}
 			//#endregion
 

packages/backend/src/core/activitypub/models/ApPersonService.ts

@@ -45,7 +45,7 @@ import type { ApNoteService } from './ApNoteService.js';
 import type { ApMfmService } from '../ApMfmService.js';
 import type { ApResolverService, Resolver } from '../ApResolverService.js';
 import type { ApLoggerService } from '../ApLoggerService.js';
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+
 import type { ApImageService } from './ApImageService.js';
 import type { IActor, ICollection, IObject, IOrderedCollection } from '../type.js';
 
@@ -307,8 +307,8 @@ export class ApPersonService implements OnModuleInit {
 						this.logger.error('error occurred while fetching following/followers collection', { stack: err });
 					}
 					return 'private';
-				})
+				}),
-			)
+			),
 		);
 
 		const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
@@ -407,13 +407,15 @@ export class ApPersonService implements OnModuleInit {
 		this.cacheService.uriPersonCache.set(user.uri, user);
 
 		// Register host
-		this.federatedInstanceService.fetch(host).then(i => {
+		if (this.meta.enableStatsForFederatedInstances) {
-			this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
+			this.federatedInstanceService.fetchOrRegister(host).then(i => {
-			this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
+				this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
-			if (this.meta.enableChartsForFederatedInstances) {
+				if (this.meta.enableChartsForFederatedInstances) {
-				this.instanceChart.newUser(i.host);
+					this.instanceChart.newUser(i.host);
-			}
+				}
-		});
+				this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
+			});
+		}
 
 		this.usersChart.update(user, true);
 
@@ -494,8 +496,8 @@ export class ApPersonService implements OnModuleInit {
 						return undefined;
 					}
 					return 'private';
-				})
+				}),
-			)
+			),
 		);
 
 		const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);

packages/backend/src/models/Meta.ts

@@ -519,6 +519,11 @@ export class MiMeta {
 	})
 	public enableChartsForFederatedInstances: boolean;
 
+	@Column('boolean', {
+		default: true,
+	})
+	public enableStatsForFederatedInstances: boolean;
+
 	@Column('boolean', {
 		default: false,
 	})

packages/backend/src/queue/processors/DeliverProcessorService.ts

@@ -75,8 +75,11 @@ export class DeliverProcessorService {
 		try {
 			await this.apRequestService.signedPost(job.data.user, job.data.to, job.data.content, job.data.digest);
 
+			this.apRequestChart.deliverSucc();
+			this.federationChart.deliverd(host, true);
+
 			// Update stats
-			this.federatedInstanceService.fetch(host).then(i => {
+			this.federatedInstanceService.fetchOrRegister(host).then(i => {
 				if (i.isNotResponding) {
 					this.federatedInstanceService.update(i.id, {
 						isNotResponding: false,
@@ -85,8 +88,6 @@ export class DeliverProcessorService {
 				}
 
 				this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
-				this.apRequestChart.deliverSucc();
-				this.federationChart.deliverd(i.host, true);
 
 				if (this.meta.enableChartsForFederatedInstances) {
 					this.instanceChart.requestSent(i.host, true);
@@ -95,8 +96,11 @@ export class DeliverProcessorService {
 
 			return 'Success';
 		} catch (res) {
+			this.apRequestChart.deliverFail();
+			this.federationChart.deliverd(host, false);
+
 			// Update stats
-			this.federatedInstanceService.fetch(host).then(i => {
+			this.federatedInstanceService.fetchOrRegister(host).then(i => {
 				if (!i.isNotResponding) {
 					this.federatedInstanceService.update(i.id, {
 						isNotResponding: true,
@@ -117,9 +121,6 @@ export class DeliverProcessorService {
 					});
 				}
 
-				this.apRequestChart.deliverFail();
-				this.federationChart.deliverd(i.host, false);
-
 				if (this.meta.enableChartsForFederatedInstances) {
 					this.instanceChart.requestSent(i.host, false);
 				}
@@ -130,7 +131,7 @@ export class DeliverProcessorService {
 				if (!res.isRetryable) {
 					// 相手が閉鎖していることを明示しているため、配送停止する
 					if (job.data.isSharedInbox && res.statusCode === 410) {
-						this.federatedInstanceService.fetch(host).then(i => {
+						this.federatedInstanceService.fetchOrRegister(host).then(i => {
 							this.federatedInstanceService.update(i.id, {
 								suspensionState: 'goneSuspended',
 							});

packages/backend/src/queue/processors/InboxProcessorService.ts

@@ -194,22 +194,24 @@ export class InboxProcessorService implements OnApplicationShutdown {
 			}
 		}
 
+		this.apRequestChart.inbox();
+		this.federationChart.inbox(authUser.user.host);
+
 		// Update stats
-		this.federatedInstanceService.fetch(authUser.user.host).then(i => {
+		if (this.meta.enableStatsForFederatedInstances) {
-			this.updateInstanceQueue.enqueue(i.id, {
+			this.federatedInstanceService.fetchOrRegister(authUser.user.host).then(i => {
-				latestRequestReceivedAt: new Date(),
+				this.updateInstanceQueue.enqueue(i.id, {
-				shouldUnsuspend: i.suspensionState === 'autoSuspendedForNotResponding',
+					latestRequestReceivedAt: new Date(),
+					shouldUnsuspend: i.suspensionState === 'autoSuspendedForNotResponding',
+				});
+
+				if (this.meta.enableChartsForFederatedInstances) {
+					this.instanceChart.requestReceived(i.host);
+				}
+
+				this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
 			});
-
+		}
-			this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
-
-			this.apRequestChart.inbox();
-			this.federationChart.inbox(i.host);
-
-			if (this.meta.enableChartsForFederatedInstances) {
-				this.instanceChart.requestReceived(i.host);
-			}
-		});
 
 		// アクティビティを処理
 		try {

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -337,6 +337,10 @@ export const meta = {
 				type: 'boolean',
 				optional: false, nullable: false,
 			},
+			enableStatsForFederatedInstances: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
 			enableServerMachineStats: {
 				type: 'boolean',
 				optional: false, nullable: false,
@@ -610,6 +614,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				truemailAuthKey: instance.truemailAuthKey,
 				enableChartsForRemoteUser: instance.enableChartsForRemoteUser,
 				enableChartsForFederatedInstances: instance.enableChartsForFederatedInstances,
+				enableStatsForFederatedInstances: instance.enableStatsForFederatedInstances,
 				enableServerMachineStats: instance.enableServerMachineStats,
 				enableIdenticonGeneration: instance.enableIdenticonGeneration,
 				bannedEmailDomains: instance.bannedEmailDomains,

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -130,6 +130,7 @@ export const paramDef = {
 		truemailAuthKey: { type: 'string', nullable: true },
 		enableChartsForRemoteUser: { type: 'boolean' },
 		enableChartsForFederatedInstances: { type: 'boolean' },
+		enableStatsForFederatedInstances: { type: 'boolean' },
 		enableServerMachineStats: { type: 'boolean' },
 		enableIdenticonGeneration: { type: 'boolean' },
 		serverRules: { type: 'array', items: { type: 'string' } },
@@ -555,6 +556,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				set.enableChartsForFederatedInstances = ps.enableChartsForFederatedInstances;
 			}
 
+			if (ps.enableStatsForFederatedInstances !== undefined) {
+				set.enableStatsForFederatedInstances = ps.enableStatsForFederatedInstances;
+			}
+
 			if (ps.enableServerMachineStats !== undefined) {
 				set.enableServerMachineStats = ps.enableServerMachineStats;
 			}

packages/frontend/src/pages/admin/performance.vue

@@ -29,6 +29,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkSwitch>
 			</div>
 
+			<div class="_panel" style="padding: 16px;">
+				<MkSwitch v-model="enableStatsForFederatedInstances" @change="onChange_enableStatsForFederatedInstances">
+					<template #label>{{ i18n.ts.enableStatsForFederatedInstances }}</template>
+					<template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+				</MkSwitch>
+			</div>
+
 			<div class="_panel" style="padding: 16px;">
 				<MkSwitch v-model="enableChartsForFederatedInstances" @change="onChange_enableChartsForFederatedInstances">
 					<template #label>{{ i18n.ts.enableChartsForFederatedInstances }}</template>
@@ -120,6 +127,7 @@ const meta = await misskeyApi('admin/meta');
 const enableServerMachineStats = ref(meta.enableServerMachineStats);
 const enableIdenticonGeneration = ref(meta.enableIdenticonGeneration);
 const enableChartsForRemoteUser = ref(meta.enableChartsForRemoteUser);
+const enableStatsForFederatedInstances = ref(meta.enableStatsForFederatedInstances);
 const enableChartsForFederatedInstances = ref(meta.enableChartsForFederatedInstances);
 
 function onChange_enableServerMachineStats(value: boolean) {
@@ -146,6 +154,14 @@ function onChange_enableChartsForRemoteUser(value: boolean) {
 	});
 }
 
+function onChange_enableStatsForFederatedInstances(value: boolean) {
+	os.apiWithDialog('admin/update-meta', {
+		enableStatsForFederatedInstances: value,
+	}).then(() => {
+		fetchInstance(true);
+	});
+}
+
 function onChange_enableChartsForFederatedInstances(value: boolean) {
 	os.apiWithDialog('admin/update-meta', {
 		enableChartsForFederatedInstances: value,