misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix additional references to loadConfig and createPostgresDataSource that were hiding in .JS files

Browse source
This commit is contained in:
Hazelnoot 2025-10-22 23:52:21 -04:00
parent e75558735b
commit 5807b33e04
4 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/migration/1740162088574-add_unsignedFetch.js
View file

@ -1,4 +1,7 @@
import { loadConfig } from '../built/config.js'; 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 { export class AddUnsignedFetch1740162088574 {
name = '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`); 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 "" // 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) { if (config.checkActivityPubGetSignature) {
// noinspection SqlWithoutWhere // noinspection SqlWithoutWhere
await queryRunner.query(`UPDATE "meta" SET "allowUnsignedFetch" = 'never'`); await queryRunner.query(`UPDATE "meta" SET "allowUnsignedFetch" = 'never'`);

6
packages/backend/ormconfig.js
View file

@ -2,8 +2,12 @@ import { DataSource } from 'typeorm';
import { loadConfig } from './built/config.js'; import { loadConfig } from './built/config.js';
import { entities } from './built/postgres.js'; import { entities } from './built/postgres.js';
import { isConcurrentIndexMigrationEnabled } from "./migration/js/migration-config.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({ export default new DataSource({
type: 'postgres', type: 'postgres',

9
packages/backend/scripts/check_connect.js
View file

@ -6,15 +6,18 @@
import Redis from 'ioredis'; import Redis from 'ioredis';
import { loadConfig } from '../built/config.js'; import { loadConfig } from '../built/config.js';
import { createPostgresDataSource } from '../built/postgres.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. // createPostgresDataSource handles primaries and replicas automatically.
// usually, it only opens connections first use, so we force it using // usually, it only opens connections first use, so we force it using
// .initialize() // .initialize()
async function connectToPostgres() { async function connectToPostgres() {
const source = createPostgresDataSource(config, new Logger('check-connect')); const source = createPostgresDataSource(config, loggerService);
await source.initialize(); await source.initialize();
await source.destroy(); await source.destroy();
} }

6
packages/backend/scripts/generate_api_json.js
View file

@ -5,6 +5,9 @@
import { execa } from 'execa'; import { execa } from 'execa';
import { writeFileSync, existsSync } from "node:fs"; 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() { async function main() {
if (!process.argv.includes('--no-build')) { if (!process.argv.includes('--no-build')) {
@ -24,7 +27,8 @@ async function main() {
/** @type {import('../src/server/api/openapi/gen-spec.js')} */ /** @type {import('../src/server/api/openapi/gen-spec.js')} */
const { genOpenapiSpec } = await import('../built/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); const spec = genOpenapiSpec(config, true);
writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8'); writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');