Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Refactor configurations

Hakan Shehu40415a5bd05e
diff --git a/apps/server/src/controllers/client/avatars/avatar-download.ts b/apps/server/src/controllers/client/avatars/avatar-download.ts
index f2fb0184..404e2ffc 100644
--- a/apps/server/src/controllers/client/avatars/avatar-download.ts
+++ b/apps/server/src/controllers/client/avatars/avatar-download.ts
@@ -4,8 +4,9 @@ import { ApiErrorCode } from '@colanode/core';
import { Readable } from 'stream';
-import { avatarStorage, BUCKET_NAMES } from '@/data/storage';
+import { avatarS3 } from '@/data/storage';
import { ResponseBuilder } from '@/lib/response-builder';
+import { configuration } from '@/lib/configuration';
export const avatarDownloadHandler = async (
req: Request,
@@ -14,11 +15,11 @@ export const avatarDownloadHandler = async (
try {
const avatarId = req.params.avatarId;
const command = new GetObjectCommand({
- Bucket: BUCKET_NAMES.AVATARS,
+ Bucket: configuration.avatarS3.bucketName,
Key: `avatars/${avatarId}.jpeg`,
});
- const avatarResponse = await avatarStorage.send(command);
+ const avatarResponse = await avatarS3.send(command);
if (!avatarResponse.Body) {
return ResponseBuilder.badRequest(res, {
code: ApiErrorCode.AvatarNotFound,
diff --git a/apps/server/src/controllers/client/avatars/avatar-upload.ts b/apps/server/src/controllers/client/avatars/avatar-upload.ts
index 5c09940d..c0e84e1a 100644
--- a/apps/server/src/controllers/client/avatars/avatar-upload.ts
+++ b/apps/server/src/controllers/client/avatars/avatar-upload.ts
@@ -6,8 +6,9 @@ import multer from 'multer';
import path from 'path';
-import { avatarStorage, BUCKET_NAMES } from '@/data/storage';
+import { avatarS3 } from '@/data/storage';
import { ResponseBuilder } from '@/lib/response-builder';
+import { configuration } from '@/lib/configuration';
const storage = multer.memoryStorage();
const uploadMulter = multer({
@@ -54,13 +55,13 @@ export const avatarUploadHandler = async (
const avatarId = generateId(IdType.Avatar);
const command = new PutObjectCommand({
- Bucket: BUCKET_NAMES.AVATARS,
+ Bucket: configuration.avatarS3.bucketName,
Key: `avatars/${avatarId}.jpeg`,
Body: jpegBuffer,
ContentType: 'image/jpeg',
});
- await avatarStorage.send(command);
+ await avatarS3.send(command);
return ResponseBuilder.success(res, { success: true, id: avatarId });
} catch {
return ResponseBuilder.internalError(res, {
diff --git a/apps/server/src/controllers/client/config/index.ts b/apps/server/src/controllers/client/config/index.ts
index c31b811b..13cff3e6 100644
--- a/apps/server/src/controllers/client/config/index.ts
+++ b/apps/server/src/controllers/client/config/index.ts
@@ -1,15 +1,15 @@
import { ServerConfig } from '@colanode/core';
import { Request, Response } from 'express';
-const { SERVER_NAME, SERVER_AVATAR } = process.env;
+import { configuration } from '@/lib/configuration';
export const configGetHandler = async (
_: Request,
res: Response
): Promise<void> => {
const config: ServerConfig = {
- name: SERVER_NAME || 'Colanode',
- avatar: SERVER_AVATAR || '',
+ name: configuration.server.name,
+ avatar: configuration.server.avatar,
version: '0.1.0',
ip: res.locals.ip,
attributes: {},
diff --git a/apps/server/src/controllers/client/workspaces/files/file-download-get.ts b/apps/server/src/controllers/client/workspaces/files/file-download-get.ts
index 1db97e9b..89a046e7 100644
--- a/apps/server/src/controllers/client/workspaces/files/file-download-get.ts
+++ b/apps/server/src/controllers/client/workspaces/files/file-download-get.ts
@@ -10,8 +10,9 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
import { database } from '@/data/database';
import { fetchEntry, mapEntry } from '@/lib/entries';
-import { BUCKET_NAMES, filesStorage } from '@/data/storage';
+import { fileS3 } from '@/data/storage';
import { ResponseBuilder } from '@/lib/response-builder';
+import { configuration } from '@/lib/configuration';
export const fileDownloadGetHandler = async (
req: Request,
@@ -51,11 +52,11 @@ export const fileDownloadGetHandler = async (
//generate presigned url for download
const path = `files/${file.workspace_id}/${file.id}${file.extension}`;
const command = new GetObjectCommand({
- Bucket: BUCKET_NAMES.FILES,
+ Bucket: configuration.fileS3.bucketName,
Key: path,
});
- const presignedUrl = await getSignedUrl(filesStorage, command, {
+ const presignedUrl = await getSignedUrl(fileS3, command, {
expiresIn: 60 * 60 * 4, // 4 hours
});
diff --git a/apps/server/src/controllers/client/workspaces/files/file-upload-complete.ts b/apps/server/src/controllers/client/workspaces/files/file-upload-complete.ts
index 89afb8d8..0af82e67 100644
--- a/apps/server/src/controllers/client/workspaces/files/file-upload-complete.ts
+++ b/apps/server/src/controllers/client/workspaces/files/file-upload-complete.ts
@@ -3,9 +3,10 @@ import { HeadObjectCommand } from '@aws-sdk/client-s3';
import { FileStatus, ApiErrorCode } from '@colanode/core';
import { database } from '@/data/database';
-import { BUCKET_NAMES, filesStorage } from '@/data/storage';
+import { fileS3 } from '@/data/storage';
import { eventBus } from '@/lib/event-bus';
import { ResponseBuilder } from '@/lib/response-builder';
+import { configuration } from '@/lib/configuration';
export const fileUploadCompleteHandler = async (
req: Request,
@@ -57,12 +58,12 @@ export const fileUploadCompleteHandler = async (
const path = `files/${file.workspace_id}/${file.id}${file.extension}`;
// check if the file exists in the bucket
const command = new HeadObjectCommand({
- Bucket: BUCKET_NAMES.FILES,
+ Bucket: configuration.fileS3.bucketName,
Key: path,
});
try {
- const headObject = await filesStorage.send(command);
+ const headObject = await fileS3.send(command);
// Verify file size matches expected size
if (headObject.ContentLength !== file.size) {
diff --git a/apps/server/src/controllers/client/workspaces/files/file-upload-init.ts b/apps/server/src/controllers/client/workspaces/files/file-upload-init.ts
index ecbf15f4..e91f984a 100644
--- a/apps/server/src/controllers/client/workspaces/files/file-upload-init.ts
+++ b/apps/server/src/controllers/client/workspaces/files/file-upload-init.ts
@@ -8,8 +8,9 @@ import { PutObjectCommand } from '@aws-sdk/client-s3';
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
import { database } from '@/data/database';
-import { BUCKET_NAMES, filesStorage } from '@/data/storage';
+import { fileS3 } from '@/data/storage';
import { ResponseBuilder } from '@/lib/response-builder';
+import { configuration } from '@/lib/configuration';
export const fileUploadInitHandler = async (
req: Request,
@@ -41,14 +42,14 @@ export const fileUploadInitHandler = async (
//generate presigned url for upload
const path = `files/${workspaceId}/${input.fileId}${file.extension}`;
const command = new PutObjectCommand({
- Bucket: BUCKET_NAMES.FILES,
+ Bucket: configuration.fileS3.bucketName,
Key: path,
ContentLength: file.size,
ContentType: file.mime_type,
});
const expiresIn = 60 * 60 * 4; // 4 hours
- const presignedUrl = await getSignedUrl(filesStorage, command, {
+ const presignedUrl = await getSignedUrl(fileS3, command, {
expiresIn,
});
diff --git a/apps/server/src/data/database.ts b/apps/server/src/data/database.ts
index a5211ef5..e443d601 100644
--- a/apps/server/src/data/database.ts
+++ b/apps/server/src/data/database.ts
@@ -11,10 +11,11 @@ import pg from 'pg';
import { databaseMigrations } from '@/data/migrations';
import { DatabaseSchema } from '@/data/schema';
+import { configuration } from '@/lib/configuration';
const dialect = new PostgresDialect({
pool: new pg.Pool({
- connectionString: process.env.DATABASE_URL,
+ connectionString: configuration.postgres.url,
}),
});
diff --git a/apps/server/src/data/redis.ts b/apps/server/src/data/redis.ts
index 42ef22c7..e5149cbd 100644
--- a/apps/server/src/data/redis.ts
+++ b/apps/server/src/data/redis.ts
@@ -1,26 +1,10 @@
import { createClient } from 'redis';
-const REDIS_URL = process.env.REDIS_URL || '';
-const REDIS_HOST = process.env.REDIS_HOST;
-const REDIS_PASSWORD = process.env.REDIS_PASSWORD;
-const REDIS_PORT = process.env.REDIS_PORT;
-const REDIS_DB = process.env.REDIS_DB;
-
-if (!REDIS_URL || !REDIS_HOST || !REDIS_PASSWORD || !REDIS_PORT || !REDIS_DB) {
- throw new Error('Redis configuration is missing');
-}
-
-export const redisConfig = {
- url: REDIS_URL,
- host: REDIS_HOST,
- password: REDIS_PASSWORD,
- port: parseInt(REDIS_PORT),
- db: parseInt(REDIS_DB),
-};
+import { configuration } from '@/lib/configuration';
export const redis = createClient({
- url: redisConfig.url,
- database: redisConfig.db,
+ url: configuration.redis.url,
+ database: configuration.redis.db,
});
export const initRedis = async () => {
diff --git a/apps/server/src/data/storage.ts b/apps/server/src/data/storage.ts
index 275cff30..0bbe3ec5 100644
--- a/apps/server/src/data/storage.ts
+++ b/apps/server/src/data/storage.ts
@@ -1,56 +1,21 @@
import { S3Client } from '@aws-sdk/client-s3';
-const AVATARS_STORAGE_ENDPOINT = process.env.AVATARS_STORAGE_ENDPOINT;
-const AVATARS_STORAGE_BUCKET_NAME = process.env.AVATARS_STORAGE_BUCKET_NAME;
-const AVATARS_STORAGE_REGION = process.env.AVATARS_STORAGE_REGION;
-const AVATARS_STORAGE_ACCESS_KEY = process.env.AVATARS_STORAGE_ACCESS_KEY;
-const AVATARS_STORAGE_SECRET_KEY = process.env.AVATARS_STORAGE_SECRET_KEY;
+import { configuration } from '@/lib/configuration';
-const FILES_STORAGE_ENDPOINT = process.env.FILES_STORAGE_ENDPOINT;
-const FILES_STORAGE_BUCKET_NAME = process.env.FILES_STORAGE_BUCKET_NAME;
-const FILES_STORAGE_REGION = process.env.FILES_STORAGE_REGION;
-const FILES_STORAGE_ACCESS_KEY = process.env.FILES_STORAGE_ACCESS_KEY;
-const FILES_STORAGE_SECRET_KEY = process.env.FILES_STORAGE_SECRET_KEY;
-
-if (
- !AVATARS_STORAGE_ENDPOINT ||
- !AVATARS_STORAGE_ACCESS_KEY ||
- !AVATARS_STORAGE_SECRET_KEY ||
- !AVATARS_STORAGE_BUCKET_NAME ||
- !AVATARS_STORAGE_REGION
-) {
- throw new Error('Avatar storage credentials not set');
-}
-
-if (
- !FILES_STORAGE_ENDPOINT ||
- !FILES_STORAGE_ACCESS_KEY ||
- !FILES_STORAGE_SECRET_KEY ||
- !FILES_STORAGE_BUCKET_NAME ||
- !FILES_STORAGE_REGION
-) {
- throw new Error('Files storage credentials not set');
-}
-
-export const avatarStorage = new S3Client({
- endpoint: AVATARS_STORAGE_ENDPOINT,
- region: AVATARS_STORAGE_REGION,
+export const avatarS3 = new S3Client({
+ endpoint: configuration.avatarS3.endpoint,
+ region: configuration.avatarS3.region,
credentials: {
- accessKeyId: AVATARS_STORAGE_ACCESS_KEY,
- secretAccessKey: AVATARS_STORAGE_SECRET_KEY,
+ accessKeyId: configuration.avatarS3.accessKey,
+ secretAccessKey: configuration.avatarS3.secretKey,
},
});
-export const filesStorage = new S3Client({
- endpoint: FILES_STORAGE_ENDPOINT,
- region: FILES_STORAGE_REGION,
+export const fileS3 = new S3Client({
+ endpoint: configuration.fileS3.endpoint,
+ region: configuration.fileS3.region,
credentials: {
- accessKeyId: FILES_STORAGE_ACCESS_KEY,
- secretAccessKey: FILES_STORAGE_SECRET_KEY,
+ accessKeyId: configuration.fileS3.accessKey,
+ secretAccessKey: configuration.fileS3.secretKey,
},
});
-
-export const BUCKET_NAMES = {
- AVATARS: AVATARS_STORAGE_BUCKET_NAME,
- FILES: FILES_STORAGE_BUCKET_NAME,
-};
diff --git a/apps/server/src/jobs/clean-entry-data.ts b/apps/server/src/jobs/clean-entry-data.ts
index 3887a948..a7680ba0 100644
--- a/apps/server/src/jobs/clean-entry-data.ts
+++ b/apps/server/src/jobs/clean-entry-data.ts
@@ -10,7 +10,8 @@ import {
import { JobHandler } from '@/types/jobs';
import { eventBus } from '@/lib/event-bus';
import { createLogger } from '@/lib/logger';
-import { BUCKET_NAMES, filesStorage } from '@/data/storage';
+import { fileS3 } from '@/data/storage';
+import { configuration } from '@/lib/configuration';
const BATCH_SIZE = 100;
@@ -286,11 +287,11 @@ const deleteFiles = async (entryIds: string[], userId: string) => {
const path = `files/${file.workspace_id}/${file.id}${file.extension}`;
const command = new DeleteObjectCommand({
- Bucket: BUCKET_NAMES.FILES,
+ Bucket: configuration.fileS3.bucketName,
Key: path,
});
- await filesStorage.send(command);
+ await fileS3.send(command);
}
hasMore = files.length === BATCH_SIZE;
diff --git a/apps/server/src/jobs/embed-entry.ts b/apps/server/src/jobs/embed-entry.ts
index 50adcfc1..f7614f99 100644
--- a/apps/server/src/jobs/embed-entry.ts
+++ b/apps/server/src/jobs/embed-entry.ts
@@ -1,9 +1,10 @@
+import { OpenAIEmbeddings } from '@langchain/openai';
+import { extractEntryText } from '@colanode/core';
+
import { JobHandler } from '@/types/jobs';
import { ChunkingService } from '@/services/chunking-service';
import { database } from '@/data/database';
-import { OpenAIEmbeddings } from '@langchain/openai';
-import { aiSettings } from '@/lib/ai-settings';
-import { extractEntryText } from '@colanode/core';
+import { configuration } from '@/lib/configuration';
import { CreateEntryEmbedding } from '@/data/schema';
export type EmbedEntryInput = {
@@ -20,7 +21,7 @@ declare module '@/types/jobs' {
}
export const embedEntryHandler: JobHandler<EmbedEntryInput> = async (input) => {
- if (!aiSettings.enabled) {
+ if (!configuration.ai.enabled) {
return;
}
@@ -54,9 +55,9 @@ export const embedEntryHandler: JobHandler<EmbedEntryInput> = async (input) => {
const chunks = await chunkingService.chunkText(textResult.text);
const embeddings = new OpenAIEmbeddings({
- apiKey: aiSettings.openai.apiKey,
- modelName: aiSettings.openai.embeddingModel,
- dimensions: aiSettings.openai.embeddingDimensions,
+ apiKey: configuration.ai.openai.apiKey,
+ modelName: configuration.ai.openai.embeddingModel,
+ dimensions: configuration.ai.openai.embeddingDimensions,
});
const existingEmbeddings = await database
@@ -91,7 +92,7 @@ export const embedEntryHandler: JobHandler<EmbedEntryInput> = async (input) => {
});
}
- const batchSize = aiSettings.openai.embeddingBatchSize;
+ const batchSize = configuration.ai.openai.embeddingBatchSize;
for (let i = 0; i < embeddingsToCreateOrUpdate.length; i += batchSize) {
const batch = embeddingsToCreateOrUpdate.slice(i, i + batchSize);
const textsToEmbed = batch.map((item) => item.text);
diff --git a/apps/server/src/jobs/embed-message.ts b/apps/server/src/jobs/embed-message.ts
index 9264cadf..ca117172 100644
--- a/apps/server/src/jobs/embed-message.ts
+++ b/apps/server/src/jobs/embed-message.ts
@@ -1,8 +1,9 @@
+import { OpenAIEmbeddings } from '@langchain/openai';
+
import { JobHandler } from '@/types/jobs';
import { ChunkingService } from '@/services/chunking-service';
import { database } from '@/data/database';
-import { OpenAIEmbeddings } from '@langchain/openai';
-import { aiSettings } from '@/lib/ai-settings';
+import { configuration } from '@/lib/configuration';
import { CreateMessageEmbedding } from '@/data/schema';
export type EmbedMessageInput = {
@@ -21,10 +22,10 @@ declare module '@/types/jobs' {
export const embedMessageHandler: JobHandler<EmbedMessageInput> = async (
input
) => {
- if (!aiSettings.enabled) {
+ if (!configuration.ai.enabled) {
return;
}
-
+
const { messageId } = input;
const message = await database
@@ -41,9 +42,9 @@ export const embedMessageHandler: JobHandler<EmbedMessageInput> = async (
const chunks = await chunkingService.chunkText(message.content);
const embeddings = new OpenAIEmbeddings({
- apiKey: aiSettings.openai.apiKey,
- modelName: aiSettings.openai.embeddingModel,
- dimensions: aiSettings.openai.embeddingDimensions,
+ apiKey: configuration.ai.openai.apiKey,
+ modelName: configuration.ai.openai.embeddingModel,
+ dimensions: configuration.ai.openai.embeddingDimensions,
});
const existingEmbeddings = await database
@@ -60,9 +61,7 @@ export const embedMessageHandler: JobHandler<EmbedMessageInput> = async (
continue;
}
- const existingEmbedding = existingEmbeddings.find(
- (e) => e.chunk === i
- );
+ const existingEmbedding = existingEmbeddings.find((e) => e.chunk === i);
if (existingEmbedding && existingEmbedding.text === chunk) {
continue;
@@ -81,7 +80,7 @@ export const embedMessageHandler: JobHandler<EmbedMessageInput> = async (
});
}
- const batchSize = aiSettings.openai.embeddingBatchSize;
+ const batchSize = configuration.ai.openai.embeddingBatchSize;
for (let i = 0; i < embeddingsToCreateOrUpdate.length; i += batchSize) {
const batch = embeddingsToCreateOrUpdate.slice(i, i + batchSize);
const textsToEmbed = batch.map((item) => item.text);
@@ -111,4 +110,4 @@ export const embedMessageHandler: JobHandler<EmbedMessageInput> = async (
}))
)
.execute();
-};
\ No newline at end of file
+};
diff --git a/apps/server/src/lib/ai-settings.ts b/apps/server/src/lib/ai-settings.ts
deleted file mode 100644
index c401c30b..00000000
--- a/apps/server/src/lib/ai-settings.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export const aiSettings = {
- enabled: false,
- embedDelay: 60000,
-
- openai: {
- apiKey: process.env.OPENAI_API_KEY || '',
- embeddingModel: 'text-embedding-3-large',
- embeddingDimensions: 2000,
- embeddingBatchSize: 50,
- },
-
- chunking: {
- defaultChunkSize: 1000,
- defaultOverlap: 200,
- enhanceWithContext: true,
- contextEnhancerModel: 'gpt-4o-mini',
- contextEnhancerTemperature: 0.3,
- },
-};
diff --git a/apps/server/src/lib/configuration.ts b/apps/server/src/lib/configuration.ts
new file mode 100644
index 00000000..ee697bb8
--- /dev/null
+++ b/apps/server/src/lib/configuration.ts
@@ -0,0 +1,150 @@
+export interface Configuration {
+ server: ServerConfiguration;
+ postgres: PostgresConfiguration;
+ redis: RedisConfiguration;
+ avatarS3: S3Configuration;
+ fileS3: S3Configuration;
+ email: EmailConfiguration;
+ ai: AiConfiguration;
+}
+
+export interface ServerConfiguration {
+ name: string;
+ avatar: string;
+}
+
+export interface PostgresConfiguration {
+ url: string;
+}
+
+export interface RedisConfiguration {
+ url: string;
+ host: string;
+ port: number;
+ password: string;
+ db: number;
+ eventsChannel: string;
+ jobsQueueName: string;
+}
+
+export interface S3Configuration {
+ endpoint: string;
+ accessKey: string;
+ secretKey: string;
+ bucketName: string;
+ region: string;
+}
+
+export interface EmailConfiguration {
+ host: string;
+ port: number;
+ user: string;
+ password: string;
+ from: string;
+}
+
+export interface AiConfiguration {
+ enabled: boolean;
+ entryEmbedDelay: number;
+ openai: OpenAiConfiguration;
+ chunking: ChunkingConfiguration;
+}
+
+export interface OpenAiConfiguration {
+ apiKey: string;
+ embeddingModel: string;
+ embeddingDimensions: number;
+ embeddingBatchSize: number;
+}
+
+export interface ChunkingConfiguration {
+ defaultChunkSize: number;
+ defaultOverlap: number;
+ enhanceWithContext: boolean;
+ contextEnhancerModel: string;
+ contextEnhancerTemperature: number;
+}
+
+const getRequiredEnv = (env: string): string => {
+ const value = process.env[env];
+ if (!value) {
+ throw new Error(`${env} is not set`);
+ }
+
+ return value;
+};
+
+const getOptionalEnv = (env: string): string | undefined => {
+ return process.env[env];
+};
+
+export const configuration: Configuration = {
+ server: {
+ name: getRequiredEnv('SERVER_NAME'),
+ avatar: getOptionalEnv('SERVER_AVATAR') || '',
+ },
+ postgres: {
+ url: getRequiredEnv('POSTGRES_URL'),
+ },
+ redis: {
+ url: getRequiredEnv('REDIS_URL'),
+ host: getRequiredEnv('REDIS_HOST'),
+ port: parseInt(getOptionalEnv('REDIS_PORT') || '6379'),
+ password: getRequiredEnv('REDIS_PASSWORD'),
+ db: parseInt(getOptionalEnv('REDIS_DB') || '0'),
+ jobsQueueName: getOptionalEnv('REDIS_JOBS_QUEUE_NAME') || 'jobs',
+ eventsChannel: getOptionalEnv('REDIS_EVENTS_CHANNEL') || 'events',
+ },
+ avatarS3: {
+ endpoint: getRequiredEnv('S3_AVATARS_ENDPOINT'),
+ accessKey: getRequiredEnv('S3_AVATARS_ACCESS_KEY'),
+ secretKey: getRequiredEnv('S3_AVATARS_SECRET_KEY'),
+ bucketName: getRequiredEnv('S3_AVATARS_BUCKET_NAME'),
+ region: getRequiredEnv('S3_AVATARS_REGION'),
+ },
+ fileS3: {
+ endpoint: getRequiredEnv('S3_FILES_ENDPOINT'),
+ accessKey: getRequiredEnv('S3_FILES_ACCESS_KEY'),
+ secretKey: getRequiredEnv('S3_FILES_SECRET_KEY'),
+ bucketName: getRequiredEnv('S3_FILES_BUCKET_NAME'),
+ region: getRequiredEnv('S3_FILES_REGION'),
+ },
+ email: {
+ host: getOptionalEnv('EMAIL_HOST') || '',
+ port: parseInt(getOptionalEnv('EMAIL_PORT') || '587'),
+ user: getOptionalEnv('EMAIL_USER') || '',
+ password: getOptionalEnv('EMAIL_PASSWORD') || '',
+ from: getOptionalEnv('EMAIL_FROM') || '',
+ },
+ ai: {
+ enabled: getOptionalEnv('AI_ENABLED') === 'true',
+ entryEmbedDelay: parseInt(
+ getOptionalEnv('AI_ENTRY_EMBED_DELAY') || '60000'
+ ),
+ openai: {
+ apiKey: getOptionalEnv('OPENAI_API_KEY') || '',
+ embeddingModel: getOptionalEnv('OPENAI_EMBEDDING_MODEL') || '',
+ embeddingDimensions: parseInt(
+ getOptionalEnv('OPENAI_EMBEDDING_DIMENSIONS') || '2000'
+ ),
+ embeddingBatchSize: parseInt(
+ getOptionalEnv('OPENAI_EMBEDDING_BATCH_SIZE') || '50'
+ ),
+ },
+ chunking: {
+ defaultChunkSize: parseInt(
+ getOptionalEnv('CHUNK_DEFAULT_CHUNK_SIZE') || '1000'
+ ),
+ defaultOverlap: parseInt(
+ getOptionalEnv('CHUNK_DEFAULT_OVERLAP') || '200'
+ ),
+ enhanceWithContext:
+ getOptionalEnv('CHUNK_ENHANCE_WITH_CONTEXT') === 'true',
+ contextEnhancerModel:
+ getOptionalEnv('CHUNK_CONTEXT_ENHANCER_MODEL') || 'gpt-4o-mini',
+ contextEnhancerTemperature: parseFloat(
+ getOptionalEnv('CHUNK_CONTEXT_ENHANCER_TEMPERATURE') || '0.3'
+ ),
+ },
+ },
+};
diff --git a/apps/server/src/lib/event-bus.ts b/apps/server/src/lib/event-bus.ts
index 31a4a5e1..3cf93e2e 100644
--- a/apps/server/src/lib/event-bus.ts
+++ b/apps/server/src/lib/event-bus.ts
@@ -1,8 +1,7 @@
import { Event } from '@/types/events';
import { redis } from '@/data/redis';
import { host } from '@/host';
-
-const CHANNEL_NAME = process.env.REDIS_EVENTS_CHANNEL ?? 'events';
+import { configuration } from '@/lib/configuration';
export interface Subscription {
id: string;
@@ -41,7 +40,7 @@ export class EventBusService {
}
const client = redis.duplicate();
- client.subscribe(CHANNEL_NAME, (message) => {
+ client.subscribe(configuration.redis.eventsChannel, (message) => {
const envelope = JSON.parse(message) as DistributedEventEnvelope;
if (envelope.hostId === host.id) {
return;
@@ -70,7 +69,10 @@ export class EventBusService {
this.processEvent(event);
if (host.environment === 'production') {
- redis.publish(CHANNEL_NAME, JSON.stringify({ event, hostId: host.id }));
+ redis.publish(
+ configuration.redis.eventsChannel,
+ JSON.stringify({ event, hostId: host.id })
+ );
}
}
diff --git a/apps/server/src/services/chunking-service.ts b/apps/server/src/services/chunking-service.ts
index 3efba6f7..b60a98e2 100644
--- a/apps/server/src/services/chunking-service.ts
+++ b/apps/server/src/services/chunking-service.ts
@@ -1,15 +1,13 @@
import { RecursiveCharacterTextSplitter } from 'langchain/text_splitter';
import { ChatOpenAI } from '@langchain/openai';
import { SystemMessage } from '@langchain/core/messages';
-import { aiSettings } from '@/lib/ai-settings';
-export class ChunkingService {
- public async chunkText(
- text: string
- ): Promise<string[]> {
+import { configuration } from '@/lib/configuration';
- const chunkSize = aiSettings.chunking.defaultChunkSize;
- const chunkOverlap = aiSettings.chunking.defaultOverlap;
+export class ChunkingService {
+ public async chunkText(text: string): Promise<string[]> {
+ const chunkSize = configuration.ai.chunking.defaultChunkSize;
+ const chunkOverlap = configuration.ai.chunking.defaultOverlap;
const splitter = new RecursiveCharacterTextSplitter({
chunkSize,
@@ -21,7 +19,7 @@ export class ChunkingService {
chunks = chunks.filter((c) => c.trim().length > 10);
- if (aiSettings.chunking.enhanceWithContext) {
+ if (configuration.ai.chunking.enhanceWithContext) {
const enriched: string[] = [];
for (const chunk of chunks) {
const c = await this.addContextToChunk(chunk, text);
@@ -39,9 +37,9 @@ export class ChunkingService {
): Promise<string> {
try {
const chat = new ChatOpenAI({
- openAIApiKey: aiSettings.openai.apiKey,
- modelName: aiSettings.chunking.contextEnhancerModel,
- temperature: aiSettings.chunking.contextEnhancerTemperature,
+ openAIApiKey: configuration.ai.openai.apiKey,
+ modelName: configuration.ai.chunking.contextEnhancerModel,
+ temperature: configuration.ai.chunking.contextEnhancerTemperature,
maxTokens: 200,
});
@@ -60,11 +58,11 @@ Generate a short (50-100 tokens) contextual prefix that seamlessly provides back
const response = await chat.invoke([new SystemMessage(prompt)]);
const context = (response.content.toString() ?? '').trim();
-
+
return `${context} ${chunk}`;
} catch (err) {
console.error('Error adding context to chunk:', err);
return chunk;
}
}
-}
\ No newline at end of file
+}
diff --git a/apps/server/src/services/email-service.ts b/apps/server/src/services/email-service.ts
index 5fce97e8..a010b059 100644
--- a/apps/server/src/services/email-service.ts
+++ b/apps/server/src/services/email-service.ts
@@ -1,10 +1,6 @@
import nodemailer from 'nodemailer';
-const SMTP_HOST = process.env.SMTP_HOST;
-const SMTP_PORT = process.env.SMTP_PORT;
-const SMTP_USER = process.env.SMTP_USER;
-const SMTP_PASS = process.env.SMTP_PASS;
-const EMAIL_FROM = process.env.EMAIL_FROM;
+import { configuration } from '@/lib/configuration';
interface EmailMessage {
to: string | string[];
@@ -19,17 +15,23 @@ class EmailService {
constructor() {}
public async init() {
- if (!SMTP_HOST || !SMTP_PORT || !SMTP_USER || !SMTP_PASS || !EMAIL_FROM) {
+ if (
+ !configuration.email.host ||
+ !configuration.email.port ||
+ !configuration.email.user ||
+ !configuration.email.password ||
+ !configuration.email.from
+ ) {
throw new Error('SMTP configuration is missing');
}
this.transporter = nodemailer.createTransport({
- host: SMTP_HOST,
- port: parseInt(SMTP_PORT),
+ host: configuration.email.host,
+ port: configuration.email.port,
secure: true,
auth: {
- user: SMTP_USER,
- pass: SMTP_PASS,
+ user: configuration.email.user,
+ pass: configuration.email.password,
},
});
@@ -42,7 +44,7 @@ class EmailService {
}
await this.transporter.sendMail({
- from: EMAIL_FROM,
+ from: configuration.email.from,
...message,
});
}
diff --git a/apps/server/src/services/entry-service.ts b/apps/server/src/services/entry-service.ts
index 63af12b8..cc25b635 100644
--- a/apps/server/src/services/entry-service.ts
+++ b/apps/server/src/services/entry-service.ts
@@ -42,7 +42,7 @@ import {
UpdateEntryInput,
UpdateEntryOutput,
} from '@/types/entries';
-import { aiSettings } from '@/lib/ai-settings';
+import { configuration } from '@/lib/configuration';
const UPDATE_RETRIES_LIMIT = 10;
@@ -1022,7 +1022,7 @@ class EntryService {
},
{
jobId: `embed_entry:${entryId}`,
- delay: aiSettings.embedDelay,
+ delay: configuration.ai.entryEmbedDelay,
}
);
}
diff --git a/apps/server/src/services/file-service.ts b/apps/server/src/services/file-service.ts
index aedc8b16..764db26e 100644
--- a/apps/server/src/services/file-service.ts
+++ b/apps/server/src/services/file-service.ts
@@ -15,7 +15,8 @@ import { database } from '@/data/database';
import { SelectUser } from '@/data/schema';
import { fetchEntry, mapEntry } from '@/lib/entries';
import { eventBus } from '@/lib/event-bus';
-import { filesStorage, BUCKET_NAMES } from '@/data/storage';
+import { fileS3 } from '@/data/storage';
+import { configuration } from '@/lib/configuration';
class FileService {
public async createFile(
@@ -171,11 +172,11 @@ class FileService {
const path = `files/${deletedFile.workspace_id}/${deletedFile.id}${deletedFile.extension}`;
const command = new DeleteObjectCommand({
- Bucket: BUCKET_NAMES.FILES,
+ Bucket: configuration.fileS3.bucketName,
Key: path,
});
- await filesStorage.send(command);
+ await fileS3.send(command);
eventBus.publish({
type: 'file_deleted',
diff --git a/apps/server/src/services/job-service.ts b/apps/server/src/services/job-service.ts
index 5583a555..f03a2b6a 100644
--- a/apps/server/src/services/job-service.ts
+++ b/apps/server/src/services/job-service.ts
@@ -1,11 +1,9 @@
import { Job, JobsOptions, Queue, Worker } from 'bullmq';
-import { redisConfig } from '@/data/redis';
+import { configuration } from '@/lib/configuration';
import { jobHandlerMap } from '@/jobs';
import { JobHandler, JobInput } from '@/types/jobs';
-const JOBS_QUEUE_NAME = process.env.REDIS_JOBS_QUEUE_NAME ?? 'jobs';
-
class JobService {
private jobQueue: Queue | undefined;
private jobWorker: Worker | undefined;
@@ -15,12 +13,12 @@ class JobService {
return;
}
- this.jobQueue = new Queue(JOBS_QUEUE_NAME, {
+ this.jobQueue = new Queue(configuration.redis.jobsQueueName, {
connection: {
- host: redisConfig.host,
- password: redisConfig.password,
- port: redisConfig.port,
- db: redisConfig.db,
+ host: configuration.redis.host,
+ password: configuration.redis.password,
+ port: configuration.redis.port,
+ db: configuration.redis.db,
},
defaultJobOptions: {
removeOnComplete: true,
@@ -33,14 +31,18 @@ class JobService {
return;
}
- this.jobWorker = new Worker(JOBS_QUEUE_NAME, this.handleJobJob, {
- connection: {
- host: redisConfig.host,
- password: redisConfig.password,
- port: redisConfig.port,
- db: redisConfig.db,
- },
- });
+ this.jobWorker = new Worker(
+ configuration.redis.jobsQueueName,
+ this.handleJobJob,
+ {
+ connection: {
+ host: configuration.redis.host,
+ password: configuration.redis.password,
+ port: configuration.redis.port,
+ db: configuration.redis.db,
+ },
+ }
+ );
}
public async addJob(job: JobInput, options?: JobsOptions) {