feat(api): AppService

- rename app.locals.configs to app.locals.paths
- load custom config use fileStrategy from yaml config in app.locals

api/config/paths.js

@@ -1,6 +1,7 @@
 const path = require('path');
 
 module.exports = {
+  dist: path.resolve(__dirname, '..', '..', 'client', 'dist'),
   publicPath: path.resolve(__dirname, '..', '..', 'client', 'public'),
   imageOutput: path.resolve(__dirname, '..', '..', 'client', 'public', 'images'),
 };

api/server/index.js

@@ -5,42 +5,37 @@ const cors = require('cors');
 const express = require('express');
 const passport = require('passport');
 const mongoSanitize = require('express-mongo-sanitize');
-const { initializeFirebase } = require('~/server/services/Files/Firebase/initialize');
-const loadCustomConfig = require('~/server/services/Config/loadCustomConfig');
-const errorController = require('~/server/controllers/ErrorController');
-const configureSocialLogins = require('~/server/socialLogins');
-const noIndex = require('~/server/middleware/noIndex');
-const { connectDb, indexSync } = require('~/lib/db');
-const { logger } = require('~/config');
+const errorController = require('./controllers/ErrorController');
+const { jwtLogin, passportLogin } = require('../strategies');
+const configureSocialLogins = require('./socialLogins');
+const { connectDb, indexSync } = require('../lib/db');
+const AppService = require('./services/AppService');
+const noIndex = require('./middleware/noIndex');
+const { logger } = require('../config');
 
-const routes = require('~/server/routes');
-const paths = require('~/config/paths');
+const routes = require('./routes');
 
 const { PORT, HOST, ALLOW_SOCIAL_LOGIN } = process.env ?? {};
 
 const port = Number(PORT) || 3080;
 const host = HOST || 'localhost';
-const projectPath = path.join(__dirname, '..', '..', 'client');
-const { jwtLogin, passportLogin } = require('~/strategies');
 
 const startServer = async () => {
   await connectDb();
   logger.info('Connected to MongoDB');
-  await loadCustomConfig();
-  initializeFirebase();
   await indexSync();
 
   const app = express();
-  app.locals.config = paths;
+  await AppService(app);
 
   // Middleware
   app.use(noIndex);
   app.use(errorController);
   app.use(express.json({ limit: '3mb' }));
   app.use(mongoSanitize());
   app.use(express.urlencoded({ extended: true, limit: '3mb' }));
-  app.use(express.static(path.join(projectPath, 'dist')));
-  app.use(express.static(path.join(projectPath, 'public')));
+  app.use(express.static(app.locals.paths.dist));
+  app.use(express.static(app.locals.paths.publicPath));
   app.set('trust proxy', 1); // trust first proxy
   app.use(cors());
 
@@ -81,7 +76,7 @@ const startServer = async () => {
   app.use('/api/files', routes.files);
 
   app.use((req, res) => {
-    res.status(404).sendFile(path.join(projectPath, 'dist', 'index.html'));
+    res.status(404).sendFile(path.join(app.locals.paths.dist, 'index.html'));
   });
 
   app.listen(port, host, () => {

api/server/routes/files/files.js

@@ -16,7 +16,7 @@ const isValidPath = (req, base, subfolder, filepath) => {
 };
 
 const deleteFile = async (req, file) => {
-  const { publicPath } = req.app.locals.config;
+  const { publicPath } = req.app.locals.paths;
   const parts = file.filepath.split(path.sep);
   const subfolder = parts[1];
   const filepath = path.join(publicPath, file.filepath);

api/server/routes/files/multer.js

@@ -8,7 +8,7 @@ const sizeLimit = 20 * 1024 * 1024; // 20 MB
 
 const storage = multer.diskStorage({
   destination: function (req, file, cb) {
-    const outputPath = path.join(req.app.locals.config.imageOutput, 'temp');
+    const outputPath = path.join(req.app.locals.paths.imageOutput, 'temp');
     if (!fs.existsSync(outputPath)) {
       fs.mkdirSync(outputPath, { recursive: true });
     }

api/server/services/AppService.js

@@ -0,0 +1,26 @@
+const { FileSources } = require('librechat-data-provider');
+const { initializeFirebase } = require('./Files/Firebase/initialize');
+const loadCustomConfig = require('./Config/loadCustomConfig');
+const paths = require('~/config/paths');
+
+/**
+ *
+ * Loads custom config and initializes app-wide variables.
+ * @function AppService
+ * @param {Express.Application} app - The Express application object.
+ */
+const AppService = async (app) => {
+  const config = (await loadCustomConfig()) ?? {};
+  const fileStrategy = config.CDN_PROVIDER ?? FileSources.local;
+
+  if (fileStrategy === FileSources.firebase) {
+    initializeFirebase();
+  }
+
+  app.locals = {
+    fileStrategy,
+    paths,
+  };
+};
+
+module.exports = AppService;

api/server/services/Files/images/convert.js

@@ -8,7 +8,7 @@ async function convertToWebP(req, file, resolution = 'high') {
   const { buffer: resizedBuffer, width, height } = await resizeImage(inputFilePath, resolution);
   const extension = path.extname(inputFilePath);
 
-  const { imageOutput } = req.app.locals.config;
+  const { imageOutput } = req.app.locals.paths;
   const userPath = path.join(imageOutput, req.user.id);
 
   if (!fs.existsSync(userPath)) {

api/server/services/Files/images/encode.js

@@ -27,7 +27,7 @@ function encodeImage(imagePath) {
  * @returns {Promise<[MongoFile, string]>}  - A promise that resolves to an array of results from updateFile and encodeImage.
  */
 async function updateAndEncode(req, file) {
-  const { publicPath, imageOutput } = req.app.locals.config;
+  const { publicPath, imageOutput } = req.app.locals.paths;
   const userPath = path.join(imageOutput, req.user.id);
 
   if (!fs.existsSync(userPath)) {

api/server/services/Files/save.js

@@ -40,7 +40,7 @@ async function saveFile(file, outputPath, outputFilename) {
  * @throws Will throw an error if the image saving process fails.
  */
 const saveLocalImage = async (req, file, filename) => {
-  const imagePath = req.app.locals.config.imageOutput;
+  const imagePath = req.app.locals.paths.imageOutput;
   const outputPath = path.join(imagePath, req.user.id ?? '');
   await saveFile(file, outputPath, filename);
 };

api/server/socialLogins.js

@@ -10,6 +10,10 @@ const {
 } = require('../strategies');
 const client = require('../cache/redis');
 
+/**
+ *
+ * @param {Express.Application} app
+ */
 const configureSocialLogins = (app) => {
   if (process.env.GOOGLE_CLIENT_ID && process.env.GOOGLE_CLIENT_SECRET) {
     passport.use(googleLogin());