Skip to content

refactor: provide env vars to federation sdk instead of loading them internally #36557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ricardogarim merged 1 commit into from
Jul 29, 2025
Merged

refactor: provide env vars to federation sdk instead of loading them internally #36557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions ee/packages/federation-matrix/src/FederationMatrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,26 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS

static async create(emitter?: Emitter<HomeserverEventSignatures>): Promise<FederationMatrix> {
const instance = new FederationMatrix(emitter);
const config = new ConfigService();
const config = new ConfigService({
database: {
uri: process.env.MONGODB_URI || 'mongodb://localhost:3001/meteor',
name: process.env.DATABASE_NAME || 'meteor',
poolSize: Number.parseInt(process.env.DATABASE_POOL_SIZE || '10', 10),
},
server: {
name: process.env.SERVER_NAME || 'rc1',
version: process.env.SERVER_VERSION || '1.0',
port: Number.parseInt(process.env.SERVER_PORT || '8080', 10),
baseUrl: process.env.SERVER_BASE_URL || 'http://rc1:8080',
host: process.env.SERVER_HOST || '0.0.0.0',
},
matrix: {
serverName: process.env.MATRIX_SERVER_NAME || 'rc1',
domain: process.env.MATRIX_DOMAIN || 'rc1',
keyRefreshInterval: Number.parseInt(process.env.MATRIX_KEY_REFRESH_INTERVAL || '60', 10),
},
signingKeyPath: process.env.CONFIG_FOLDER || './rc1.signing.key',
});
const matrixConfig = config.getMatrixConfig();
const serverConfig = config.getServerConfig();
const signingKeys = await config.getSigningKey();
Expand All @@ -57,7 +76,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
},
};

await createFederationContainer(containerOptions);
await createFederationContainer(containerOptions, config);
instance.homeserverServices = getAllServices();
instance.buildMatrixHTTPRoutes();

Expand All @@ -75,7 +94,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
.use(getMatrixSendJoinRoutes(this.homeserverServices))
.use(getMatrixTransactionsRoutes(this.homeserverServices))
.use(getKeyServerRoutes(this.homeserverServices))
.use(getFederationVersionsRoutes());
.use(getFederationVersionsRoutes(this.homeserverServices));

wellKnown.use(getWellKnownRoutes(this.homeserverServices));

Expand Down
12 changes: 6 additions & 6 deletions ee/packages/federation-matrix/src/api/_matrix/versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ConfigService } from '@hs/federation-sdk';
import type { HomeserverServices } from '@hs/federation-sdk';
import { Router } from '@rocket.chat/http-router';
import { ajv } from '@rocket.chat/rest-typings/dist/v1/Ajv';

Expand All @@ -25,8 +25,8 @@ const GetVersionsResponseSchema = {

const isGetVersionsResponseProps = ajv.compile(GetVersionsResponseSchema);

export const getFederationVersionsRoutes = () => {
const configService = new ConfigService();
export const getFederationVersionsRoutes = (services: HomeserverServices) => {
const { config } = services;

return new Router('/federation').get(
'/v1/version',
Expand All @@ -38,12 +38,12 @@ export const getFederationVersionsRoutes = () => {
license: ['federation'],
},
async () => {
const config = configService.getServerConfig();
const serverConfig = config.getServerConfig();

const response = {
server: {
name: config.name,
version: config.version,
name: serverConfig.name,
version: serverConfig.version,
},
};

Expand Down
Loading