Rework .env processing

Author: ptrumpis

server.js

@@ -1,4 +1,5 @@
-import express from 'express';
+import { Config } from './src/utils/config.js';
+import { bootstrap } from './src/init.js';
 import lenses from './src/endpoints/explorer/lenses.js';
 import categorylenses from './src/endpoints/explorer/category/lenses.js';
 import top from './src/endpoints/explorer/top.js';
@@ -14,11 +15,7 @@ import importCache from './src/endpoints/import/cache.js';
 import importLens from './src/endpoints/import/lens.js';
 import v1 from './src/endpoints/v1.js';
 import wildcard from './src/endpoints/wildcard.js';
-import { Config } from './src/utils/config.js';
-import * as init from './src/init.js';
-import * as dotenv from 'dotenv';
-
-dotenv.config();
+import express from 'express';
 
 const enableCacheImport = Config.app.flag.enable_cache_import;
 const enableCustomImport = Config.app.flag.enable_custom_import;
@@ -49,5 +46,5 @@ app.use('*', wildcard);
 
 app.listen(serverPort, () => {
     console.info(`[Info] ✅ Snap Camera Server is running on port ${serverPort}`);
-    init.bootstrap();
+    bootstrap();
 });

src/utils/config.js

@@ -2,7 +2,12 @@ import YAML from 'yaml';
 import * as fs from 'fs/promises';
 import dotenv from 'dotenv';
 
-dotenv.config();
+const envConfig = dotenv.config();
+for (const key in envConfig.parsed) {
+    if (process.env[key]?.trim() === '') {
+        process.env[key] = envConfig.parsed[key]?.trim() || '';
+    }
+}
 
 const Config = await loadConfig();
 

src/utils/db.js

@@ -1,10 +1,7 @@
 import mysql from 'mysql2';
 import { Config } from './config.js';
-import * as dotenv from 'dotenv';
 import * as Util from './helper.js';
 
-dotenv.config();
-
 const connection = mysql.createPool({
     host: process.env.DB_HOST,
     port: process.env.DB_PORT,

src/utils/helper.js

@@ -1,11 +1,8 @@
 import { SnapLensWebCrawler } from '@ptrumpis/snap-lens-web-crawler';
 import { Config } from './config.js';
-import * as dotenv from 'dotenv';
 import * as DB from './db.js';
 import * as Storage from './storage.js';
 
-dotenv.config();
-
 const relayTimeout = Config.app.relay.timeout;
 const relayServer = Config.app.relay.server;
 

src/utils/importer.js

@@ -1,14 +1,11 @@
 import JSZip from 'jszip';
 import LensFileParser from '@ptrumpis/snap-lens-file-extractor';
 import { Config } from './config.js';
-import * as dotenv from 'dotenv';
 import * as fs from 'fs/promises';
 import * as zstd from 'fzstd';
 import * as Storage from './storage.js';
 import * as Util from './helper.js';
 
-dotenv.config();
-
 const storageServer = process.env.STORAGE_SERVER;
 const storagePath = process.env.STORAGE_PATH;
 const mediaDir = process.env.MEDIA_DIR.replace(/^\/+/, '');

src/utils/storage.js

@@ -1,12 +1,9 @@
 import { SnapLensWebCrawler } from '@ptrumpis/snap-lens-web-crawler';
-import * as dotenv from 'dotenv';
 import * as fs from 'fs/promises';
 import path from 'path';
 import sharp from 'sharp';
 import { Config } from './config.js';
 
-dotenv.config();
-
 const storagePath = process.env.STORAGE_PATH;
 const storageServer = process.env.STORAGE_SERVER;
 const ignoreAltMedia = Config.app.flag.ignore_alt_media;