From a69efd722a5dbb9d30e7d910f882e7ca22ef65e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Mon, 12 Feb 2024 04:13:52 +0900 Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E3=82=AF=E3=82=A8=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=8C=E6=9C=9F=E5=BE=85=E9=80=9A=E3=82=8A?= =?UTF-8?q?=E3=81=AE=E5=AE=9F=E8=A3=85=E3=81=A7=E3=81=AF=E3=81=AA=E3=81=8B?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20(MisskeyIO#436)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/postgres.ts | 105 ++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts index 3d665d3e4..fb0b137c2 100644 --- a/packages/backend/src/postgres.ts +++ b/packages/backend/src/postgres.ts @@ -7,7 +7,9 @@ import pg from 'pg'; pg.types.setTypeParser(20, Number); -import { DataSource, Logger } from 'typeorm'; +import { DataSource, Logger, QueryRunner } from 'typeorm'; +import { QueryResultCache } from 'typeorm/cache/QueryResultCache.js'; +import { QueryResultCacheOptions } from 'typeorm/cache/QueryResultCacheOptions.js'; import * as highlight from 'cli-highlight'; import { entities as charts } from '@/core/chart/entities.js'; @@ -82,8 +84,8 @@ import { MiReversiGame } from '@/models/ReversiGame.js'; import { Config } from '@/config.js'; import { bindThis } from '@/decorators.js'; -import { envOption } from './env.js'; import MisskeyLogger from '@/logger.js'; +import { envOption } from './env.js'; export const dbLogger = new MisskeyLogger('db'); @@ -203,6 +205,99 @@ export const entities = [ ]; const log = process.env.NODE_ENV !== 'production'; +const timeoutFinalizationRegistry = new FinalizationRegistry((reference: { name: string; timeout: NodeJS.Timeout }) => { + dbLogger.info(`Finalizing timeout: ${reference.name}`); + clearInterval(reference.timeout); +}); + +class InMemoryQueryResultCache implements QueryResultCache { + private cache: Map; + + constructor( + private dataSource: DataSource, + ) { + this.cache = new Map(); + + const gcIntervalHandle = setInterval(() => { + this.gc(); + }, 1000 * 60 * 3); + + timeoutFinalizationRegistry.register(this, { name: typeof this, timeout: gcIntervalHandle }); + } + + connect(): Promise { + return Promise.resolve(undefined); + } + + disconnect(): Promise { + return Promise.resolve(undefined); + } + + synchronize(queryRunner: QueryRunner): Promise { + return Promise.resolve(undefined); + } + + async clear(queryRunner?: QueryRunner): Promise { + return new Promise((ok) => { + this.cache.clear(); + ok(); + }); + } + + storeInCache( + options: QueryResultCacheOptions, + savedCache: QueryResultCacheOptions | undefined, + queryRunner?: QueryRunner, + ): Promise { + return new Promise((ok, fail) => { + if (options.identifier) { + this.cache.set(options.identifier, options); + ok(); + } else if (options.query) { + this.cache.set(options.query, options); + ok(); + } + fail(new Error('No identifier or query')); + }); + } + + getFromCache( + options: QueryResultCacheOptions, + queryRunner?: QueryRunner, + ): Promise { + return new Promise((ok) => { + if (options.identifier) { + ok(this.cache.get(options.identifier)); + } else if (options.query) { + ok(this.cache.get(options.query)); + } else { + ok(undefined); + } + }); + } + + isExpired(savedCache: QueryResultCacheOptions): boolean { + return (savedCache.time ?? 0) + savedCache.duration < Date.now(); + } + + remove(identifiers: string[], queryRunner?: QueryRunner): Promise { + return new Promise((ok) => { + for (const identifier of identifiers) { + this.cache.delete(identifier); + } + ok(); + }); + } + + gc(): void { + const now = Date.now(); + for (const [key, { time, duration }] of this.cache.entries()) { + if ((time ?? 0) + duration < now) { + this.cache.delete(key); + } + } + } +} export function createPostgresDataSource(config: Config) { return new DataSource({ @@ -236,7 +331,11 @@ export function createPostgresDataSource(config: Config) { } : {}), synchronize: process.env.NODE_ENV === 'test', dropSchema: process.env.NODE_ENV === 'test', - cache: !config.db.disableCache && process.env.NODE_ENV !== 'test', + cache: !config.db.disableCache && process.env.NODE_ENV !== 'test' ? { + provider(dataSource) { + return new InMemoryQueryResultCache(dataSource); + }, + } : false, logging: log, logger: log ? new MyCustomLogger() : undefined, maxQueryExecutionTime: 10000, // 10s