diff --git a/packages/backend/migration/1740162088574-add_unsignedFetch.js b/packages/backend/migration/1740162088574-add_unsignedFetch.js index 0744e68dfa..a30f5ae966 100644 --- a/packages/backend/migration/1740162088574-add_unsignedFetch.js +++ b/packages/backend/migration/1740162088574-add_unsignedFetch.js @@ -1,4 +1,7 @@ import { loadConfig } from '../built/config.js'; +import { LoggerService } from '../built/core/LoggerService.js'; +import { NativeTimeService } from '../built/global/TimeService.js'; +import { EnvService } from '../built/global/EnvService.js'; export class AddUnsignedFetch1740162088574 { name = 'AddUnsignedFetch1740162088574' @@ -16,7 +19,8 @@ export class AddUnsignedFetch1740162088574 { await queryRunner.query(`UPDATE "user" SET "allowUnsignedFetch" = 'always' WHERE "username" LIKE '%.%' AND "host" IS null`); // Special one-time migration: convert legacy config "" to meta setting "" - const config = await loadConfig(); + const loggerService = new LoggerService(console, new NativeTimeService(), new EnvService()); + const config = await loadConfig(loggerService); if (config.checkActivityPubGetSignature) { // noinspection SqlWithoutWhere await queryRunner.query(`UPDATE "meta" SET "allowUnsignedFetch" = 'never'`); diff --git a/packages/backend/ormconfig.js b/packages/backend/ormconfig.js index d59e647d89..14a66cdf57 100644 --- a/packages/backend/ormconfig.js +++ b/packages/backend/ormconfig.js @@ -2,8 +2,12 @@ import { DataSource } from 'typeorm'; import { loadConfig } from './built/config.js'; import { entities } from './built/postgres.js'; import { isConcurrentIndexMigrationEnabled } from "./migration/js/migration-config.js"; +import { LoggerService } from './built/core/LoggerService.js'; +import { NativeTimeService } from './built/global/TimeService.js'; +import { EnvService } from './built/global/EnvService.js'; -const config = loadConfig(); +const loggerService = new LoggerService(console, new NativeTimeService(), new EnvService()); +const config = loadConfig(loggerService); export default new DataSource({ type: 'postgres', diff --git a/packages/backend/scripts/check_connect.js b/packages/backend/scripts/check_connect.js index 865bb63d55..3a8f1c4abb 100644 --- a/packages/backend/scripts/check_connect.js +++ b/packages/backend/scripts/check_connect.js @@ -6,15 +6,18 @@ import Redis from 'ioredis'; import { loadConfig } from '../built/config.js'; import { createPostgresDataSource } from '../built/postgres.js'; -import Logger from '../built/logger.js'; +import { LoggerService } from '../built/core/LoggerService.js'; +import { NativeTimeService } from '../built/global/TimeService.js'; +import { EnvService } from '../built/global/EnvService.js'; -const config = loadConfig(); +const loggerService = new LoggerService(console, new NativeTimeService(), new EnvService()); +const config = loadConfig(loggerService); // createPostgresDataSource handles primaries and replicas automatically. // usually, it only opens connections first use, so we force it using // .initialize() async function connectToPostgres() { - const source = createPostgresDataSource(config, new Logger('check-connect')); + const source = createPostgresDataSource(config, loggerService); await source.initialize(); await source.destroy(); } diff --git a/packages/backend/scripts/generate_api_json.js b/packages/backend/scripts/generate_api_json.js index 798e243004..c554755e74 100644 --- a/packages/backend/scripts/generate_api_json.js +++ b/packages/backend/scripts/generate_api_json.js @@ -5,6 +5,9 @@ import { execa } from 'execa'; import { writeFileSync, existsSync } from "node:fs"; +import { LoggerService } from '../built/core/LoggerService.js'; +import { NativeTimeService } from '../built/global/TimeService.js'; +import { EnvService } from '../built/global/EnvService.js'; async function main() { if (!process.argv.includes('--no-build')) { @@ -24,7 +27,8 @@ async function main() { /** @type {import('../src/server/api/openapi/gen-spec.js')} */ const { genOpenapiSpec } = await import('../built/server/api/openapi/gen-spec.js'); - const config = loadConfig(); + const loggerService = new LoggerService(console, new NativeTimeService(), new EnvService()); + const config = loadConfig(loggerService); const spec = genOpenapiSpec(config, true); writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');