feat(web): disabled caching for developers

tabarra · Feb 19, 2022 · 9593aeb · 9593aeb
1 parent 24f9d7e
commit 9593aeb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/components/webServer/ctxUtils.js b/src/components/webServer/ctxUtils.js
@@ -7,10 +7,6 @@ const chalk = require('chalk');
 const helpers = require('../../extras/helpers');
 const { dir, log, logOk, logWarn, logError } = require('../../extras/console')(modulename);
 
-/**
- * Preload essential templates to prevent multiple file reads
- */
-let _templateCache = {}
 
 //Helper functions
 const now = () => { return Math.round(Date.now() / 1000); };
@@ -39,6 +35,7 @@ const getJavascriptConsts = (allConsts = []) => {
 };
 
 //Consts
+const templateCache = new Map();
 const WEBPIPE_PATH = 'https://monitor/WebPipe/';
 const RESOURCE_PATH = 'nui://monitor/web/public/';
 const THEME_DARK = 'theme--dark';
@@ -65,10 +62,11 @@ function getEjsOptions(filePath) {
  * @returns {Promise<void>}
  */
 async function loadWebTemplate(name) {
-    if (!_templateCache[name]) {
+    if (GlobalData.isDeveloperMode || !templateCache.has(name)) {
         try {
             const rawTemplate = await fs.readFile(getWebViewPath(name), 'utf-8');
-            _templateCache[name] = ejs.compile(rawTemplate, getEjsOptions(name + '.html'));
+            const compiled = ejs.compile(rawTemplate, getEjsOptions(name + '.html'));
+            templateCache.set(name, compiled);
         } catch (e) {
             if (e.code == 'ENOENT') {
                 e = new Error(`The '${name}' template was not found:\n` +
@@ -78,7 +76,7 @@ async function loadWebTemplate(name) {
         }
     }
 
-    return _templateCache[name];
+    return templateCache.get(name);
 }
 
 
@@ -96,7 +94,7 @@ async function renderMasterView(view, reqSess, data, txVars) {
     data.profilePicture = (reqSess && reqSess.auth && reqSess.auth.picture) ? reqSess.auth.picture : DEFAULT_AVATAR;
     data.isTempPassword = (reqSess && reqSess.auth && reqSess.auth.isTempPassword);
     data.isLinux = (GlobalData.osType == 'linux');
-    data.showAdvanced = (GlobalData.isAdvancedUser || GlobalData.verbose);
+    data.showAdvanced = (GlobalData.isDeveloperMode || GlobalData.verbose);
     data.dynamicAd = txVars.isWebInterface && globals.dynamicAds.pick('main');
 
     let out;

diff --git a/src/index.js b/src/index.js
@@ -39,7 +39,7 @@ if (process.env.APP_ENV !== 'webpack' && txAdmin1337Convar !== 'IKnowWhatImDoing
     logError('Looks like you don\'t know what you are doing.');
     logDie('Please use the compiled release from GitHub or the version that comes with the latest FXServer.');
 }
-const isAdvancedUser = (process.env.APP_ENV !== 'webpack' && txAdmin1337Convar == 'IKnowWhatImDoing');
+const isDeveloperMode = (process.env.APP_ENV !== 'webpack' && txAdmin1337Convar == 'IKnowWhatImDoing');
 
 //Get OSType
 const osTypeVar = os.type();
@@ -173,7 +173,7 @@ if (fs.existsSync(zapCfgFile)) {
 
         loopbackInterfaces.push(forceInterface);
 
-        if (!isAdvancedUser) fs.unlinkSync(zapCfgFile);
+        if (!isDeveloperMode) fs.unlinkSync(zapCfgFile);
     } catch (error) {
         logDie(`Failed to load with ZAP-Hosting configuration error: ${error.message}`);
     }
@@ -236,7 +236,7 @@ if (!serverProfile.length) {
 const noLookAlikesAlphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZ';
 GlobalData = {
     //Env
-    isAdvancedUser,
+    isDeveloperMode,
     osType,
     resourceName,
     fxServerVersion,