Skip to content
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.

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

fix: redis caching empty settings #822

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions api/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,7 @@ export const config: Config = {
retentionReset: 24 * 60 * 60 * 1000, // 1 day
},
},
infra: {
clusterMode: process.env.IS_CLUSTER === 'true' ? true : false,
},
};
3 changes: 3 additions & 0 deletions api/src/config/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,7 @@ export type Config = {
retentionReset: number;
};
};
infra: {
clusterMode: boolean;
};
};
4 changes: 1 addition & 3 deletions api/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import { AppInstance } from './app.instance';
import { HexabotModule } from './app.module';
import { config } from './config';
import { LoggerService } from './logger/logger.service';
import { seedDatabase } from './seeder';
import { SettingService } from './setting/services/setting.service';
import { swagger } from './swagger';
import { getSessionStore } from './utils/constants/session-store';
Expand Down Expand Up @@ -54,7 +53,7 @@ async function bootstrap() {
settingService
.getAllowedOrigins()
.then((allowedOrigins) => {
if (!origin || allowedOrigins.has(origin)) {
if (!origin || allowedOrigins.includes(origin)) {
callback(null, true);
} else {
callback(new Error('Not allowed by CORS'));
Expand Down Expand Up @@ -109,7 +108,6 @@ async function bootstrap() {
});

if (!isProduction) {
await seedDatabase(app);
swagger(app);
}

Expand Down
7 changes: 7 additions & 0 deletions api/src/migration/migration.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ import leanDefaults from 'mongoose-lean-defaults';
import leanGetters from 'mongoose-lean-getters';
import leanVirtuals from 'mongoose-lean-virtuals';

import { AppInstance } from '@/app.instance';
import { AttachmentService } from '@/attachment/services/attachment.service';
import { config } from '@/config';
import { LoggerService } from '@/logger/logger.service';
import { seedDatabase } from '@/migration/seeders/seeder';
import { MetadataService } from '@/setting/services/metadata.service';
import idPlugin from '@/utils/schema-plugin/id.plugin';

Expand Down Expand Up @@ -51,12 +53,17 @@ export class MigrationService implements OnApplicationBootstrap {
) {}

async onApplicationBootstrap() {
const isProduction = config.env.toLowerCase().includes('prod');

await this.ensureMigrationPathExists();

if (mongoose.connection.readyState !== 1) {
await this.connect();
}
this.logger.log('Mongoose connection established!');
if (!isProduction) {
await seedDatabase(AppInstance.getApp());
}

if (!this.isCLI && config.mongo.autoMigrate) {
this.logger.log('Executing migrations ...');
Expand Down
55 changes: 28 additions & 27 deletions api/src/seeder.ts → api/src/migration/seeders/seeder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@

import { INestApplicationContext } from '@nestjs/common';

import { CategorySeeder } from './chat/seeds/category.seed';
import { categoryModels } from './chat/seeds/category.seed-model';
import { ContextVarSeeder } from './chat/seeds/context-var.seed';
import { contextVarModels } from './chat/seeds/context-var.seed-model';
import { LanguageSeeder } from './i18n/seeds/language.seed';
import { languageModels } from './i18n/seeds/language.seed-model';
import { TranslationSeeder } from './i18n/seeds/translation.seed';
import { translationModels } from './i18n/seeds/translation.seed-model';
import { LoggerService } from './logger/logger.service';
import { NlpEntitySeeder } from './nlp/seeds/nlp-entity.seed';
import { nlpEntityModels } from './nlp/seeds/nlp-entity.seed-model';
import { NlpValueSeeder } from './nlp/seeds/nlp-value.seed';
import { nlpValueModels } from './nlp/seeds/nlp-value.seed-model';
import { MetadataSeeder } from './setting/seeds/metadata.seed';
import { DEFAULT_METADATA } from './setting/seeds/metadata.seed-model';
import { SettingSeeder } from './setting/seeds/setting.seed';
import { DEFAULT_SETTINGS } from './setting/seeds/setting.seed-model';
import { PermissionCreateDto } from './user/dto/permission.dto';
import { Role } from './user/schemas/role.schema';
import { ModelSeeder } from './user/seeds/model.seed';
import { modelModels } from './user/seeds/model.seed-model';
import { PermissionSeeder } from './user/seeds/permission.seed';
import { permissionModels } from './user/seeds/permission.seed-model';
import { RoleSeeder } from './user/seeds/role.seed';
import { roleModels } from './user/seeds/role.seed-model';
import { UserSeeder } from './user/seeds/user.seed';
import { userModels } from './user/seeds/user.seed-model';
import { CategorySeeder } from '@/chat/seeds/category.seed';
import { categoryModels } from '@/chat/seeds/category.seed-model';
import { ContextVarSeeder } from '@/chat/seeds/context-var.seed';
import { contextVarModels } from '@/chat/seeds/context-var.seed-model';
import { LanguageSeeder } from '@/i18n/seeds/language.seed';
import { languageModels } from '@/i18n/seeds/language.seed-model';
import { TranslationSeeder } from '@/i18n/seeds/translation.seed';
import { translationModels } from '@/i18n/seeds/translation.seed-model';
import { LoggerService } from '@/logger/logger.service';
import { NlpEntitySeeder } from '@/nlp/seeds/nlp-entity.seed';
import { nlpEntityModels } from '@/nlp/seeds/nlp-entity.seed-model';
import { NlpValueSeeder } from '@/nlp/seeds/nlp-value.seed';
import { nlpValueModels } from '@/nlp/seeds/nlp-value.seed-model';
import { MetadataSeeder } from '@/setting/seeds/metadata.seed';
import { DEFAULT_METADATA } from '@/setting/seeds/metadata.seed-model';
import { SettingSeeder } from '@/setting/seeds/setting.seed';
import { DEFAULT_SETTINGS } from '@/setting/seeds/setting.seed-model';
import { PermissionCreateDto } from '@/user/dto/permission.dto';
import { Role } from '@/user/schemas/role.schema';
import { ModelSeeder } from '@/user/seeds/model.seed';
import { modelModels } from '@/user/seeds/model.seed-model';
import { PermissionSeeder } from '@/user/seeds/permission.seed';
import { permissionModels } from '@/user/seeds/permission.seed-model';
import { RoleSeeder } from '@/user/seeds/role.seed';
import { roleModels } from '@/user/seeds/role.seed-model';
import { UserSeeder } from '@/user/seeds/user.seed';
import { userModels } from '@/user/seeds/user.seed-model';

export async function seedDatabase(app: INestApplicationContext) {
const logger = await app.resolve(LoggerService);
Expand Down Expand Up @@ -160,4 +160,5 @@ export async function seedDatabase(app: INestApplicationContext) {
logger.error('Unable to seed the database with nlp entities!');
throw e;
}
logger.log('Database seeded!');
}
7 changes: 2 additions & 5 deletions api/src/setting/services/setting.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,15 @@ export class SettingService extends BaseService<Setting> {
const settings = (await this.find({
label: 'allowed_domains',
})) as TextSetting[];

const allowedDomains = settings.flatMap((setting) =>
setting.value.split(',').filter((o) => !!o),
);

const uniqueOrigins = new Set([
return [
...config.security.cors.allowOrigins,
...config.sockets.onlyAllowOrigins,
...allowedDomains,
]);

return uniqueOrigins;
];
}

/**
Expand Down
2 changes: 1 addition & 1 deletion api/src/websocket/utils/gateway-options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const buildWebSocketGatewayOptions = (): Partial<ServerOptions> => {
settingService
.getAllowedOrigins()
.then((allowedOrigins) => {
if (origin && allowedOrigins.has(origin)) {
if (origin && allowedOrigins.includes(origin)) {
cb(null, true);
} else {
// eslint-disable-next-line no-console
Expand Down
3 changes: 3 additions & 0 deletions docker/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,6 @@ APP_REDIS_PORT=9001
REDIS_ENABLED=false
REDIS_HOST=redis
REDIS_PORT=6379

# Cluster mode
IS_CLUSTER=false
Loading