From af3258dc79488b73435819e7799eb1515f15a6aa Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 2 Jul 2023 16:02:32 +0900 Subject: [PATCH] perf(backend): make some features optionable Resolve #11064 Resolve #11065 --- CHANGELOG.md | 4 ++++ locales/index.d.ts | 2 ++ locales/ja-JP.yml | 2 ++ packages/backend/assets/avatar.png | Bin 0 -> 13477 bytes .../1688280713783-add-meta-options.js | 13 ++++++++++++ .../backend/src/daemons/ServerStatsService.ts | 12 ++++++++--- packages/backend/src/models/entities/Meta.ts | 10 +++++++++ packages/backend/src/server/ServerService.ts | 15 ++++++++++---- .../src/server/api/endpoints/admin/meta.ts | 10 +++++++++ .../server/api/endpoints/admin/update-meta.ts | 10 +++++++++ .../src/server/api/endpoints/server-info.ts | 19 ++++++++++++++++++ .../src/pages/admin/other-settings.vue | 14 +++++++++++++ .../src/widgets/server-metric/index.vue | 2 +- 13 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 packages/backend/assets/avatar.png create mode 100644 packages/backend/migration/1688280713783-add-meta-options.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 681105fb7e..72c4f53d18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ ## 13.x.x (unreleased) +### General +- identicon生成を無効にしてパフォーマンスを向上させることができるようになりました +- サーバーのマシン情報の公開を無効にしてパフォーマンスを向上させることができるようになりました + ### Client - Fix: サーバーメトリクスが90度傾いている diff --git a/locales/index.d.ts b/locales/index.d.ts index eed29f408c..af6b803278 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1066,6 +1066,8 @@ export interface Locale { "additionalEmojiDictionary": string; "installed": string; "branding": string; + "enableServerMachineStats": string; + "enableIdenticonGeneration": string; "_initialAccountSetting": { "accountCreated": string; "letsStartAccountSetup": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 8004e53575..e7202bfbb5 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1063,6 +1063,8 @@ goToMisskey: "Misskeyへ" additionalEmojiDictionary: "絵文字の追加辞書" installed: "インストール済み" branding: "ブランディング" +enableServerMachineStats: "サーバーのマシン情報を公開する" +enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にする" _initialAccountSetting: accountCreated: "アカウントの作成が完了しました！" diff --git a/packages/backend/assets/avatar.png b/packages/backend/assets/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..1b95a0c560c32cf2a0060d9e911b1cc3171dfaba GIT binary patch literal 13477 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 literal 0 HcmV?d00001 diff --git a/packages/backend/migration/1688280713783-add-meta-options.js b/packages/backend/migration/1688280713783-add-meta-options.js new file mode 100644 index 0000000000..12406fe085 --- /dev/null +++ b/packages/backend/migration/1688280713783-add-meta-options.js @@ -0,0 +1,13 @@ +export class AddMetaOptions1688280713783 { + name = 'AddMetaOptions1688280713783' + + async up(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" ADD "enableServerMachineStats" boolean NOT NULL DEFAULT false`); + await queryRunner.query(`ALTER TABLE "meta" ADD "enableIdenticonGeneration" boolean NOT NULL DEFAULT true`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableIdenticonGeneration"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableServerMachineStats"`); + } +} diff --git a/packages/backend/src/daemons/ServerStatsService.ts b/packages/backend/src/daemons/ServerStatsService.ts index 6cd71c0e2a..375fd5e516 100644 --- a/packages/backend/src/daemons/ServerStatsService.ts +++ b/packages/backend/src/daemons/ServerStatsService.ts @@ -3,6 +3,7 @@ import si from 'systeminformation'; import Xev from 'xev'; import * as osUtils from 'os-utils'; import { bindThis } from '@/decorators.js'; +import { MetaService } from '@/core/MetaService.js'; import type { OnApplicationShutdown } from '@nestjs/common'; const ev = new Xev(); @@ -14,9 +15,10 @@ const round = (num: number) => Math.round(num * 10) / 10; @Injectable() export class ServerStatsService implements OnApplicationShutdown { - private intervalId: NodeJS.Timer; + private intervalId: NodeJS.Timer | null = null; constructor( + private metaService: MetaService, ) { } @@ -24,7 +26,9 @@ export class ServerStatsService implements OnApplicationShutdown { * Report server stats regularly */ @bindThis - public start(): void { + public async start(): Promise { + if (!(await this.metaService.fetch(true)).enableServerMachineStats) return; + const log = [] as any[]; ev.on('requestServerStatsLog', x => { @@ -64,7 +68,9 @@ export class ServerStatsService implements OnApplicationShutdown { @bindThis public dispose(): void { - clearInterval(this.intervalId); + if (this.intervalId) { + clearInterval(this.intervalId); + } } @bindThis diff --git a/packages/backend/src/models/entities/Meta.ts b/packages/backend/src/models/entities/Meta.ts index f799551f30..a251c0b31c 100644 --- a/packages/backend/src/models/entities/Meta.ts +++ b/packages/backend/src/models/entities/Meta.ts @@ -413,6 +413,16 @@ export class Meta { }) public enableChartsForFederatedInstances: boolean; + @Column('boolean', { + default: false, + }) + public enableServerMachineStats: boolean; + + @Column('boolean', { + default: true, + }) + public enableIdenticonGeneration: boolean; + @Column('jsonb', { default: { }, }) diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts index c3d45e4ad6..1bae71617b 100644 --- a/packages/backend/src/server/ServerService.ts +++ b/packages/backend/src/server/ServerService.ts @@ -16,6 +16,7 @@ import { createTemp } from '@/misc/create-temp.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { LoggerService } from '@/core/LoggerService.js'; import { bindThis } from '@/decorators.js'; +import { MetaService } from '@/core/MetaService.js'; import { ActivityPubServerService } from './ActivityPubServerService.js'; import { NodeinfoServerService } from './NodeinfoServerService.js'; import { ApiServerService } from './api/ApiServerService.js'; @@ -45,6 +46,7 @@ export class ServerService implements OnApplicationShutdown { @Inject(DI.emojisRepository) private emojisRepository: EmojisRepository, + private metaService: MetaService, private userEntityService: UserEntityService, private apiServerService: ApiServerService, private openApiServerService: OpenApiServerService, @@ -161,11 +163,16 @@ export class ServerService implements OnApplicationShutdown { }); fastify.get<{ Params: { x: string } }>('/identicon/:x', async (request, reply) => { - const [temp, cleanup] = await createTemp(); - await genIdenticon(request.params.x, fs.createWriteStream(temp)); reply.header('Content-Type', 'image/png'); reply.header('Cache-Control', 'public, max-age=86400'); - return fs.createReadStream(temp).on('close', () => cleanup()); + + if ((await this.metaService.fetch()).enableIdenticonGeneration) { + const [temp, cleanup] = await createTemp(); + await genIdenticon(request.params.x, fs.createWriteStream(temp)); + return fs.createReadStream(temp).on('close', () => cleanup()); + } else { + return reply.redirect('/static-assets/avatar.png'); + } }); fastify.get<{ Params: { code: string } }>('/verify-email/:code', async (request, reply) => { @@ -224,7 +231,7 @@ export class ServerService implements OnApplicationShutdown { @bindThis public async dispose(): Promise { - await this.streamingApiServerService.detach(); + await this.streamingApiServerService.detach(); await this.#fastify.close(); } diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 4cc1b6011f..28aec7a090 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -262,6 +262,14 @@ export const meta = { type: 'boolean', optional: false, nullable: false, }, + enableServerMachineStats: { + type: 'boolean', + optional: false, nullable: false, + }, + enableIdenticonGeneration: { + type: 'boolean', + optional: false, nullable: false, + }, policies: { type: 'object', optional: false, nullable: false, @@ -364,6 +372,8 @@ export default class extends Endpoint { enableActiveEmailValidation: instance.enableActiveEmailValidation, enableChartsForRemoteUser: instance.enableChartsForRemoteUser, enableChartsForFederatedInstances: instance.enableChartsForFederatedInstances, + enableServerMachineStats: instance.enableServerMachineStats, + enableIdenticonGeneration: instance.enableIdenticonGeneration, policies: { ...DEFAULT_POLICIES, ...instance.policies }, }; }); diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 1de5e9efd3..5c9d8e3fac 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -96,6 +96,8 @@ export const paramDef = { enableActiveEmailValidation: { type: 'boolean' }, enableChartsForRemoteUser: { type: 'boolean' }, enableChartsForFederatedInstances: { type: 'boolean' }, + enableServerMachineStats: { type: 'boolean' }, + enableIdenticonGeneration: { type: 'boolean' }, serverRules: { type: 'array', items: { type: 'string' } }, preservedUsernames: { type: 'array', items: { type: 'string' } }, }, @@ -399,6 +401,14 @@ export default class extends Endpoint { set.enableChartsForFederatedInstances = ps.enableChartsForFederatedInstances; } + if (ps.enableServerMachineStats !== undefined) { + set.enableServerMachineStats = ps.enableServerMachineStats; + } + + if (ps.enableIdenticonGeneration !== undefined) { + set.enableIdenticonGeneration = ps.enableIdenticonGeneration; + } + if (ps.serverRules !== undefined) { set.serverRules = ps.serverRules; } diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts index 1620e8ae52..552441e430 100644 --- a/packages/backend/src/server/api/endpoints/server-info.ts +++ b/packages/backend/src/server/api/endpoints/server-info.ts @@ -2,9 +2,12 @@ import * as os from 'node:os'; import si from 'systeminformation'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; +import { MetaService } from '@/core/MetaService.js'; export const meta = { requireCredential: false, + allowGet: true, + cacheSec: 60 * 1, tags: ['meta'], } as const; @@ -19,8 +22,24 @@ export const paramDef = { @Injectable() export default class extends Endpoint { constructor( + private metaService: MetaService, ) { super(meta, paramDef, async () => { + if (!(await this.metaService.fetch()).enableServerMachineStats) return { + machine: '?', + cpu: { + model: '?', + cores: 0, + }, + mem: { + total: 0, + }, + fs: { + total: 0, + used: 0, + }, + }; + const memStats = await si.mem(); const fsStats = await si.fsSize(); diff --git a/packages/frontend/src/pages/admin/other-settings.vue b/packages/frontend/src/pages/admin/other-settings.vue index 15d720a070..d3e1d9efc1 100644 --- a/packages/frontend/src/pages/admin/other-settings.vue +++ b/packages/frontend/src/pages/admin/other-settings.vue @@ -4,6 +4,14 @@
+ + + + + + + + @@ -27,17 +35,23 @@ import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; import MkSwitch from '@/components/MkSwitch.vue'; +let enableServerMachineStats: boolean = $ref(false); +let enableIdenticonGeneration: boolean = $ref(false); let enableChartsForRemoteUser: boolean = $ref(false); let enableChartsForFederatedInstances: boolean = $ref(false); async function init() { const meta = await os.api('admin/meta'); + enableServerMachineStats = meta.enableServerMachineStats; + enableIdenticonGeneration = meta.enableIdenticonGeneration; enableChartsForRemoteUser = meta.enableChartsForRemoteUser; enableChartsForFederatedInstances = meta.enableChartsForFederatedInstances; } function save() { os.apiWithDialog('admin/update-meta', { + enableServerMachineStats, + enableIdenticonGeneration, enableChartsForRemoteUser, enableChartsForFederatedInstances, }).then(() => { diff --git a/packages/frontend/src/widgets/server-metric/index.vue b/packages/frontend/src/widgets/server-metric/index.vue index e019ff540b..1a78f4bcd6 100644 --- a/packages/frontend/src/widgets/server-metric/index.vue +++ b/packages/frontend/src/widgets/server-metric/index.vue @@ -62,7 +62,7 @@ const { widgetProps, configure, save } = useWidgetPropsManager(name, const meta = ref(null); -os.api('server-info', {}).then(res => { +os.apiGet('server-info', {}).then(res => { meta.value = res; });